643 files changed, 32568 insertions, 17865 deletions

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
index 58bd51d5cc0..d51cd3ab819 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF
@@ -91,6 +91,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

+ org.eclipse.uml2.uml.profile.standard;visibility:=reexport,

  org.eclipse.papyrus.sysml;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.ecore b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.ecore
index 43e1a40914c..2d31565a576 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.ecore
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.ecore
@@ -1111,31 +1111,31 @@
         </eAnnotations>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowChangeAttribute"

             ordered="false" lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowChangeCardinality"

             ordered="false" lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowChangeDescription"

             ordered="false" lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowChangeName" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowMove" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowReduction" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowRefinement" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowRegrouping" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowRemoval" ordered="false"

             lowerBound="1" eType="#//structure/vehiclefeaturemodeling/DeviationPermissionKind"

-            defaultValueLiteral="YES"/>

+            defaultValueLiteral="yes"/>

         <eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false"

             unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>

         <eStructuralFeatures xsi:type="ecore:EReference" name="feature" ordered="false"

@@ -1653,7 +1653,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_RedefinableElement"

           ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Refine" eSuperTypes="#//requirements/RequirementsRelationship platform:/plugin/org.eclipse.uml2.uml.profile.l2/model/L2.ecore#//Refine">

+    <eClassifiers xsi:type="ecore:EClass" name="Refine" eSuperTypes="#//requirements/RequirementsRelationship platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="The Refine is a relationship metaclass, which signifies a dependency relationship in-between Requirements and EAElements, showing the relationship when a client EAElement refines the supplier Requirement.&#xA;&#xA;Semantics:&#xA;The Refine metaclass signifies a refined requirement/refined by relationship between a Requirement and an EAElement, where the modification of the supplier Requirement may impact the refining client EAElement. The Refine metaclass implies the semantics that the refining client EAElement is not complete, without the supplier Requirement. &#xA;&#xA;Constraints:&#xA;[1] The property refinedBy must not have the types Requirement or RequirementContainer.&#xA;&#xA;Notation:&#xA;A Refine relationship is shown as a dashed arrow between the Requirements and EAElement. The entity at the tail of the arrow (the refining EAElement) depends on the Requirement at the arrowhead (the refined Requirement).&#xA;&#xA;Extension: specializes UML2 stereotype Refine, which extends Dependency."/>

       </eAnnotations>

@@ -3036,7 +3036,7 @@
         <details key="documentation" value="The GenericConstraint denotes a property, requirement, or a validation result for the identified element of the model. The kind of GenericConstraint is described as one of the GenericConstraintKind literals.&#xA;&#xA;Example: If the attribute genericConstraintType is cableLength, the genericConstraintValue could be &quot;5 meters&quot; (value of a numerical datatype with unit &quot;meters&quot;).&#xA;&#xA;Semantics:&#xA;The GenericConstraint does not describe what is classically referred to as a design constraint but has the role of a property, requirement, or a validation result. It is a requirement if this GenericConstraint refines a Requirement (by the Refine relationship). The GenericConstraint is a validation result if it realizes a VVActualOutcome, it is an intended validation result if it realizes a VVIntendedOutcome, and in other cases it denotes a property.&#xA;&#xA;&#xA;&#xA;Extension: Class, Constraint"/>

       </eAnnotations>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="designConstraintType"

-          ordered="false" eType="#//genericconstraints/GenericConstraintKind" defaultValueLiteral=""/>

+          ordered="false" eType="#//genericconstraints/GenericConstraintKind" />

       <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"

           unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="genericConstraintValue"

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.genmodel b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.genmodel
index 0419b0e1201..756b6083ada 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.genmodel
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/model/eastadl.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.eastadl/src" modelPluginID="org.eclipse.papyrus.eastadl"

     modelName="Eastadl" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"

-    copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml.profile.l2/model/L2.genmodel#//l2 platform:/plugin/org.eclipse.papyrus.sysml/model/sysml.genmodel#//sysml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

+    copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.genmodel#//Standard platform:/plugin/org.eclipse.papyrus.sysml/model/SysML.profile.genmodel#//sysml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

   <foreignModel>eastadl.ecore</foreignModel>

   <genPackages prefix="Eastadl" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"

       ecorePackage="eastadl.ecore#/">

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlFactory.java
index e6260c46caf..dde873cf161 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.EastadlPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface EastadlFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	EastadlFactory eINSTANCE = org.eclipse.papyrus.eastadl.impl.EastadlFactoryImpl.init();

@@ -35,6 +37,7 @@ public interface EastadlFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlPackage.java
index 205cd78b630..6ce93fe2022 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/EastadlPackage.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.EastadlFactory

  * @model kind="package"

  * @generated

@@ -43,6 +44,7 @@ public interface EastadlPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

@@ -51,6 +53,7 @@ public interface EastadlPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dummy <em>dummy</em>}' enum.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.dummy

 		 * @see org.eclipse.papyrus.eastadl.impl.EastadlPackageImpl#getdummy()

 		 * @generated

@@ -62,6 +65,7 @@ public interface EastadlPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "eastadl";

@@ -69,6 +73,7 @@ public interface EastadlPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/1";

@@ -76,6 +81,7 @@ public interface EastadlPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "EAST-ADL2";

@@ -83,6 +89,7 @@ public interface EastadlPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	EastadlPackage eINSTANCE = org.eclipse.papyrus.eastadl.impl.EastadlPackageImpl.init();

@@ -91,6 +98,7 @@ public interface EastadlPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dummy <em>dummy</em>}' enum.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.dummy

 	 * @see org.eclipse.papyrus.eastadl.impl.EastadlPackageImpl#getdummy()

 	 * @generated

@@ -101,6 +109,7 @@ public interface EastadlPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dummy <em>dummy</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>dummy</em>'.

 	 * @see org.eclipse.papyrus.eastadl.dummy

 	 * @generated

@@ -111,6 +120,7 @@ public interface EastadlPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexFactory.java
index ed812fd7839..f3e9d84b233 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.AnnexPackage
  * @generated
  */
 public interface AnnexFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	AnnexFactory eINSTANCE = org.eclipse.papyrus.eastadl.annex.impl.AnnexFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface AnnexFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexPackage.java
index e19f868dc94..32769adc5d0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/AnnexPackage.java
@@ -23,34 +23,39 @@ import org.eclipse.emf.ecore.EPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.AnnexFactory
  * @model kind="package"
  * @generated
  */
 public interface AnnexPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '<em>Dummy</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.papyrus.eastadl.annex.impl.AnnexPackageImpl#getDummy()
 		 * @generated
@@ -63,6 +68,7 @@ public interface AnnexPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "annex";
@@ -71,6 +77,7 @@ public interface AnnexPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Annex/1";
@@ -79,6 +86,7 @@ public interface AnnexPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Annex";
@@ -87,6 +95,7 @@ public interface AnnexPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	AnnexPackage eINSTANCE = org.eclipse.papyrus.eastadl.annex.impl.AnnexPackageImpl.init();
@@ -96,6 +105,7 @@ public interface AnnexPackage extends EPackage {
 	 * The meta object id for the '<em>Dummy</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.papyrus.eastadl.annex.impl.AnnexPackageImpl#getDummy()
 	 * @generated
@@ -106,6 +116,7 @@ public interface AnnexPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -115,6 +126,7 @@ public interface AnnexPackage extends EPackage {
 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Dummy</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexFactoryImpl.java
index 260f41f9763..77807a4fec8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.annex.*;
 import org.eclipse.papyrus.eastadl.annex.AnnexFactory;
 import org.eclipse.papyrus.eastadl.annex.AnnexPackage;
 
@@ -29,12 +30,15 @@ import org.eclipse.papyrus.eastadl.annex.AnnexPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -47,16 +51,16 @@ public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static AnnexFactory init() {
 		try {
 			AnnexFactory theAnnexFactory = (AnnexFactory)EPackage.Registry.INSTANCE.getEFactory(AnnexPackage.eNS_URI);
-			if (theAnnexFactory != null) {
+			if(theAnnexFactory != null) {
 				return theAnnexFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new AnnexFactoryImpl();
@@ -66,6 +70,7 @@ public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnnexFactoryImpl() {
@@ -75,6 +80,7 @@ public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {
@@ -84,34 +90,37 @@ public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case AnnexPackage.DUMMY:
-				return convertDummyToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case AnnexPackage.DUMMY:
+			return convertDummyToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createDummyFromString(EDataType eDataType, String initialValue) {
@@ -121,21 +130,23 @@ public class AnnexFactoryImpl extends EFactoryImpl implements AnnexFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case AnnexPackage.DUMMY:
-				return createDummyFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case AnnexPackage.DUMMY:
+			return createDummyFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnnexPackage getAnnexPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexPackageImpl.java
index 75b4cc3330f..7140fd8a2fe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/impl/AnnexPackageImpl.java
@@ -81,6 +81,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
@@ -88,6 +89,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType dummyEDataType = null;
@@ -95,6 +97,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -102,16 +105,18 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * 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 AnnexPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link AnnexPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static AnnexPackage init() {
-		if (isInited) return (AnnexPackage)EPackage.Registry.INSTANCE.getEPackage(AnnexPackage.eNS_URI);
+		if(isInited)
+			return (AnnexPackage)EPackage.Registry.INSTANCE.getEPackage(AnnexPackage.eNS_URI);
 
 		// Obtain or create and register package
 		AnnexPackageImpl theAnnexPackage = (AnnexPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AnnexPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AnnexPackageImpl());
@@ -213,7 +218,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 		// Mark meta-data to indicate it can't be changed
 		theAnnexPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(AnnexPackage.eNS_URI, theAnnexPackage);
 		return theAnnexPackage;
@@ -222,6 +227,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -229,19 +235,19 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.annex.AnnexPackage#eNS_URI
 	 * @see #init()
@@ -252,14 +258,16 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create data types
@@ -269,6 +277,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnnexFactory getAnnexFactory() {
@@ -278,6 +287,7 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getDummy() {
@@ -285,14 +295,16 @@ public class AnnexPackageImpl extends EPackageImpl implements AnnexPackage {
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalDescription.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalDescription.java
index bacfdd5eac5..2351fdc06de 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalDescription.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalDescription.java
@@ -21,33 +21,34 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Architectural Description</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * A collection of products to document an architecture. [IEEE 1471]
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getAggregates <em>Aggregates</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getIdentifies <em>Identifies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getAggregates <em>Aggregates</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getIdentifies <em>Identifies</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecturalDescription()
  * @model
  * @generated
  */
 public interface ArchitecturalDescription extends Concept {
+
 	/**
 	 * Returns the value of the '<em><b>Aggregates</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Aggregates</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Aggregates</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Aggregates</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecturalDescription_Aggregates()
 	 * @model required="true" ordered="false"
@@ -60,10 +61,10 @@ public interface ArchitecturalDescription extends Concept {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Identifies</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Identifies</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Identifies</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecturalDescription_Identifies()
 	 * @model required="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalModel.java
index 87fc61e5a93..f18e78f1ced 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ArchitecturalModel.java
@@ -20,12 +20,13 @@ package org.eclipse.papyrus.eastadl.annex.needs;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Architectural Model</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * A view may consist of one or more architectural models. Each such architectural model is developed using the methods established by its associated architectural viewpoint. An architectural model may participate in more than one view. [IEEE 1471]
+ * A view may consist of one or more architectural models. Each such architectural model is developed using the methods established by its associated
+ * architectural viewpoint. An architectural model may participate in more than one view. [IEEE 1471]
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecturalModel()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Architecture.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Architecture.java
index 70367119502..5f0485e55d3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Architecture.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Architecture.java
@@ -20,31 +20,33 @@ package org.eclipse.papyrus.eastadl.annex.needs;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Architecture</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The fundamental organization of a system embodied in its components, their relationships to each other, and to the environment, and the principles guiding its design and evolution. [IEEE 1471]
+ * The fundamental organization of a system embodied in its components, their relationships to each other, and to the environment, and the principles
+ * guiding its design and evolution. [IEEE 1471]
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Architecture#getDescribedBy <em>Described By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Architecture#getDescribedBy <em>Described By</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecture()
  * @model
  * @generated
  */
 public interface Architecture extends Concept {
+
 	/**
 	 * Returns the value of the '<em><b>Described By</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Described By</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Described By</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Described By</em>' reference.
 	 * @see #setDescribedBy(ArchitecturalDescription)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getArchitecture_DescribedBy()
@@ -57,7 +59,9 @@ public interface Architecture extends Concept {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.Architecture#getDescribedBy <em>Described By</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Described By</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Described By</em>' reference.
 	 * @see #getDescribedBy()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/BusinessOpportunity.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/BusinessOpportunity.java
index f69417f3653..22e87cbc6b5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/BusinessOpportunity.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/BusinessOpportunity.java
@@ -23,34 +23,36 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Business Opportunity</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The business opportunity represents a brief description of the business opportunity being met by developing the EE-System which establishes traceability from artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
+ * The business opportunity represents a brief description of the business opportunity being met by developing the EE-System which establishes
+ * traceability from artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProblemStatement <em>Problem Statement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProductPositioning <em>Product Positioning</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity <em>Business Opportunity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProblemStatement <em>Problem Statement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProductPositioning <em>Product Positioning</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity <em>Business Opportunity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getBusinessOpportunity()
  * @model
  * @generated
  */
 public interface BusinessOpportunity extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getBusinessOpportunity_Base_Class()
@@ -63,7 +65,9 @@ public interface BusinessOpportunity extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -73,10 +77,10 @@ public interface BusinessOpportunity extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Business Opportunity</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Business Opportunity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Business Opportunity</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Business Opportunity</em>' attribute.
 	 * @see #setBusinessOpportunity(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getBusinessOpportunity_BusinessOpportunity()
@@ -90,10 +94,10 @@ public interface BusinessOpportunity extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Problem Statement</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Problem Statement</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Problem Statement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getBusinessOpportunity_ProblemStatement()
 	 * @model ordered="false"
@@ -106,10 +110,10 @@ public interface BusinessOpportunity extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Product Positioning</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Product Positioning</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Product Positioning</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getBusinessOpportunity_ProductPositioning()
 	 * @model ordered="false"
@@ -118,10 +122,13 @@ public interface BusinessOpportunity extends TraceableSpecification {
 	EList<ProductPositioning> getProductPositioning();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity <em>Business Opportunity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity <em>Business Opportunity</em>}
+	 * ' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Business Opportunity</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Business Opportunity</em>' attribute.
 	 * @see #getBusinessOpportunity()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Concept.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Concept.java
index 96d2cfc90f8..10bbee2c733 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Concept.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Concept.java
@@ -22,12 +22,12 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Concept</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * An abstract or general idea inferred or derived from specific instances. [Webster]
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getConcept()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Mission.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Mission.java
index 43fe557e4cc..2706fa0a274 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Mission.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Mission.java
@@ -20,12 +20,12 @@ package org.eclipse.papyrus.eastadl.annex.needs;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mission</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * A mission is a use or operation for which a system is intended by one or more stakeholders to meet some set of objectives. [IEEE 1471]
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getMission()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsFactory.java
index c211edb816a..1f4f335a2d7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage
  * @generated
  */
 public interface NeedsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	NeedsFactory eINSTANCE = org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Business Opportunity</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Business Opportunity</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Mission</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Mission</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Vehicle System</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Vehicle System</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Architecture</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Architecture</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Architectural Description</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Architectural Description</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Architectural Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Architectural Model</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Problem Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Problem Statement</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Product Positioning</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Product Positioning</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Stakeholder</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Stakeholder</em>'.
 	 * @generated
 	 */
@@ -119,6 +131,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns a new object of class '<em>Stakeholder Need</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Stakeholder Need</em>'.
 	 * @generated
 	 */
@@ -128,6 +141,7 @@ public interface NeedsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsPackage.java
index 76315510129..b04aad7e4e3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/NeedsPackage.java
@@ -27,34 +27,39 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsFactory
  * @model kind="package"
  * @generated
  */
 public interface NeedsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl <em>Stakeholder Need</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getStakeholderNeed()
 		 * @generated
@@ -65,6 +70,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STAKEHOLDER_NEED__BASE_CLASS = eINSTANCE.getStakeholderNeed_Base_Class();
@@ -73,6 +79,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Need</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STAKEHOLDER_NEED__NEED = eINSTANCE.getStakeholderNeed_Need();
@@ -81,6 +88,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STAKEHOLDER_NEED__PRIORITY = eINSTANCE.getStakeholderNeed_Priority();
@@ -89,6 +97,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Stake Holder</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STAKEHOLDER_NEED__STAKE_HOLDER = eINSTANCE.getStakeholderNeed_StakeHolder();
@@ -97,14 +106,17 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Problem Statement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STAKEHOLDER_NEED__PROBLEM_STATEMENT = eINSTANCE.getStakeholderNeed_ProblemStatement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl <em>Problem Statement</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl <em>Problem Statement</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getProblemStatement()
 		 * @generated
@@ -115,6 +127,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROBLEM_STATEMENT__BASE_CLASS = eINSTANCE.getProblemStatement_Base_Class();
@@ -123,6 +136,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Affects</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROBLEM_STATEMENT__AFFECTS = eINSTANCE.getProblemStatement_Affects();
@@ -131,6 +145,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Impact</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PROBLEM_STATEMENT__IMPACT = eINSTANCE.getProblemStatement_Impact();
@@ -139,6 +154,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Problem</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PROBLEM_STATEMENT__PROBLEM = eINSTANCE.getProblemStatement_Problem();
@@ -147,14 +163,17 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Solution Benefits</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PROBLEM_STATEMENT__SOLUTION_BENEFITS = eINSTANCE.getProblemStatement_SolutionBenefits();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl <em>Product Positioning</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl <em>Product Positioning</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getProductPositioning()
 		 * @generated
@@ -165,6 +184,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRODUCT_POSITIONING__BASE_CLASS = eINSTANCE.getProductPositioning_Base_Class();
@@ -173,6 +193,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Driving Needs</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PRODUCT_POSITIONING__DRIVING_NEEDS = eINSTANCE.getProductPositioning_DrivingNeeds();
@@ -181,6 +202,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Key Capabilities</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PRODUCT_POSITIONING__KEY_CAPABILITIES = eINSTANCE.getProductPositioning_KeyCapabilities();
@@ -189,6 +211,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Primary Competitive Alternative</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE = eINSTANCE.getProductPositioning_PrimaryCompetitiveAlternative();
@@ -197,6 +220,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Primary Differentiation</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION = eINSTANCE.getProductPositioning_PrimaryDifferentiation();
@@ -205,14 +229,17 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Customers</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PRODUCT_POSITIONING__TARGET_CUSTOMERS = eINSTANCE.getProductPositioning_TargetCustomers();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl <em>Business Opportunity</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl <em>Business Opportunity</em>}
+		 * ' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getBusinessOpportunity()
 		 * @generated
@@ -223,6 +250,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference BUSINESS_OPPORTUNITY__BASE_CLASS = eINSTANCE.getBusinessOpportunity_Base_Class();
@@ -231,6 +259,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Problem Statement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT = eINSTANCE.getBusinessOpportunity_ProblemStatement();
@@ -239,6 +268,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Product Positioning</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING = eINSTANCE.getBusinessOpportunity_ProductPositioning();
@@ -247,6 +277,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Business Opportunity</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY = eINSTANCE.getBusinessOpportunity_BusinessOpportunity();
@@ -255,6 +286,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ConceptImpl <em>Concept</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ConceptImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getConcept()
 		 * @generated
@@ -265,6 +297,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.MissionImpl <em>Mission</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.MissionImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getMission()
 		 * @generated
@@ -275,6 +308,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl <em>Vehicle System</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getVehicleSystem()
 		 * @generated
@@ -285,6 +319,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Fulfills</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_SYSTEM__FULFILLS = eINSTANCE.getVehicleSystem_Fulfills();
@@ -293,6 +328,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Has An</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_SYSTEM__HAS_AN = eINSTANCE.getVehicleSystem_HasAn();
@@ -301,6 +337,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Has</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_SYSTEM__HAS = eINSTANCE.getVehicleSystem_Has();
@@ -309,6 +346,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl <em>Architecture</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecture()
 		 * @generated
@@ -319,14 +357,17 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Described By</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ARCHITECTURE__DESCRIBED_BY = eINSTANCE.getArchitecture_DescribedBy();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl <em>Architectural Description</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl
+		 * <em>Architectural Description</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecturalDescription()
 		 * @generated
@@ -337,6 +378,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Aggregates</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ARCHITECTURAL_DESCRIPTION__AGGREGATES = eINSTANCE.getArchitecturalDescription_Aggregates();
@@ -345,14 +387,17 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Identifies</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ARCHITECTURAL_DESCRIPTION__IDENTIFIES = eINSTANCE.getArchitecturalDescription_Identifies();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalModelImpl <em>Architectural Model</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalModelImpl <em>Architectural Model</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalModelImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecturalModel()
 		 * @generated
@@ -363,6 +408,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl <em>Stakeholder</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl
 		 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getStakeholder()
 		 * @generated
@@ -373,6 +419,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STAKEHOLDER__BASE_CLASS = eINSTANCE.getStakeholder_Base_Class();
@@ -381,6 +428,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Responsibilities</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STAKEHOLDER__RESPONSIBILITIES = eINSTANCE.getStakeholder_Responsibilities();
@@ -389,6 +437,7 @@ public interface NeedsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Success Criteria</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STAKEHOLDER__SUCCESS_CRITERIA = eINSTANCE.getStakeholder_SuccessCriteria();
@@ -399,6 +448,7 @@ public interface NeedsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "needs";
@@ -407,6 +457,7 @@ public interface NeedsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Annex/Needs/1";
@@ -415,6 +466,7 @@ public interface NeedsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Needs";
@@ -423,6 +475,7 @@ public interface NeedsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	NeedsPackage eINSTANCE = org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl.init();
@@ -431,6 +484,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl <em>Stakeholder Need</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getStakeholderNeed()
 	 * @generated
@@ -441,6 +495,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl <em>Problem Statement</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getProblemStatement()
 	 * @generated
@@ -451,6 +506,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl <em>Product Positioning</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getProductPositioning()
 	 * @generated
@@ -461,6 +517,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl <em>Business Opportunity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getBusinessOpportunity()
 	 * @generated
@@ -471,6 +528,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ConceptImpl <em>Concept</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ConceptImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getConcept()
 	 * @generated
@@ -481,6 +539,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.MissionImpl <em>Mission</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.MissionImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getMission()
 	 * @generated
@@ -491,6 +550,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl <em>Architecture</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecture()
 	 * @generated
@@ -498,9 +558,11 @@ public interface NeedsPackage extends EPackage {
 	int ARCHITECTURE = 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl <em>Architectural Description</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl
+	 * <em>Architectural Description</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecturalDescription()
 	 * @generated
@@ -511,6 +573,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalModelImpl <em>Architectural Model</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalModelImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getArchitecturalModel()
 	 * @generated
@@ -521,6 +584,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl <em>Stakeholder</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getStakeholder()
 	 * @generated
@@ -531,6 +595,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +605,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +615,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,6 +625,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -567,6 +635,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -576,6 +645,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -585,6 +655,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Responsibilities</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -594,6 +665,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Success Criteria</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -604,6 +676,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Stakeholder</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -613,6 +686,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -622,6 +696,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -631,6 +706,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -640,6 +716,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -649,6 +726,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -658,6 +736,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -667,6 +746,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Need</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -676,6 +756,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Priority</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -685,6 +766,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Stake Holder</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -694,6 +776,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Problem Statement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -703,6 +786,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Stakeholder Need</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -712,6 +796,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -721,6 +806,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -730,6 +816,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -739,6 +826,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -748,6 +836,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -757,6 +846,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -766,6 +856,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Affects</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -775,6 +866,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Impact</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -784,6 +876,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Problem</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -793,6 +886,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Solution Benefits</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -802,6 +896,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Problem Statement</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -811,6 +906,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -820,6 +916,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -829,6 +926,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -838,6 +936,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -847,6 +946,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -856,6 +956,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -865,6 +966,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Driving Needs</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -874,6 +976,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Key Capabilities</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -883,6 +986,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Primary Competitive Alternative</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -892,6 +996,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Primary Differentiation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -901,6 +1006,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Customers</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -910,6 +1016,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Product Positioning</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -919,6 +1026,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -928,6 +1036,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -937,6 +1046,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -946,6 +1056,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -955,6 +1066,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -964,6 +1076,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -973,6 +1086,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Problem Statement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -982,6 +1096,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Product Positioning</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -991,6 +1106,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Business Opportunity</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1000,6 +1116,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Business Opportunity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1009,6 +1126,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1018,6 +1136,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1027,6 +1146,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1036,6 +1156,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Concept</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1045,6 +1166,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1054,6 +1176,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1063,6 +1186,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1072,6 +1196,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Mission</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1081,6 +1206,7 @@ public interface NeedsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl <em>Vehicle System</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.impl.NeedsPackageImpl#getVehicleSystem()
 	 * @generated
@@ -1091,6 +1217,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1100,6 +1227,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1109,6 +1237,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1118,6 +1247,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Fulfills</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1127,6 +1257,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Has An</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1136,6 +1267,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Has</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1145,6 +1277,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Vehicle System</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1154,6 +1287,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1163,6 +1297,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1172,6 +1307,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1181,6 +1317,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Described By</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1190,6 +1327,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Architecture</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1199,6 +1337,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1208,6 +1347,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1217,6 +1357,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1226,6 +1367,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Aggregates</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1235,6 +1377,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Identifies</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1244,6 +1387,7 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Architectural Description</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1253,6 +1397,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1262,6 +1407,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1271,6 +1417,7 @@ public interface NeedsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1280,15 +1427,18 @@ public interface NeedsPackage extends EPackage {
 	 * The number of structural features of the '<em>Architectural Model</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ARCHITECTURAL_MODEL_FEATURE_COUNT = CONCEPT_FEATURE_COUNT + 0;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription <em>Architectural Description</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription <em>Architectural Description</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Architectural Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription
 	 * @generated
@@ -1296,9 +1446,11 @@ public interface NeedsPackage extends EPackage {
 	EClass getArchitecturalDescription();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getAggregates <em>Aggregates</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getAggregates
+	 * <em>Aggregates</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Aggregates</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getAggregates()
 	 * @see #getArchitecturalDescription()
@@ -1307,9 +1459,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getArchitecturalDescription_Aggregates();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getIdentifies <em>Identifies</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getIdentifies
+	 * <em>Identifies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Identifies</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription#getIdentifies()
 	 * @see #getArchitecturalDescription()
@@ -1321,6 +1475,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel <em>Architectural Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Architectural Model</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel
 	 * @generated
@@ -1331,6 +1486,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.Architecture <em>Architecture</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Architecture</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Architecture
 	 * @generated
@@ -1341,6 +1497,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.Architecture#getDescribedBy <em>Described By</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Described By</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Architecture#getDescribedBy()
 	 * @see #getArchitecture()
@@ -1352,6 +1509,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity <em>Business Opportunity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Business Opportunity</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity
 	 * @generated
@@ -1359,9 +1517,11 @@ public interface NeedsPackage extends EPackage {
 	EClass getBusinessOpportunity();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBase_Class()
 	 * @see #getBusinessOpportunity()
@@ -1370,9 +1530,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getBusinessOpportunity_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity <em>Business Opportunity</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity
+	 * <em>Business Opportunity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Business Opportunity</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getBusinessOpportunity()
 	 * @see #getBusinessOpportunity()
@@ -1381,9 +1543,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getBusinessOpportunity_BusinessOpportunity();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProblemStatement <em>Problem Statement</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProblemStatement
+	 * <em>Problem Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Problem Statement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProblemStatement()
 	 * @see #getBusinessOpportunity()
@@ -1392,9 +1556,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getBusinessOpportunity_ProblemStatement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProductPositioning <em>Product Positioning</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProductPositioning
+	 * <em>Product Positioning</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Product Positioning</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity#getProductPositioning()
 	 * @see #getBusinessOpportunity()
@@ -1406,6 +1572,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.Concept <em>Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Concept</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Concept
 	 * @generated
@@ -1416,6 +1583,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.Mission <em>Mission</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Mission</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Mission
 	 * @generated
@@ -1426,6 +1594,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1435,6 +1604,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement <em>Problem Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Problem Statement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement
 	 * @generated
@@ -1445,6 +1615,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getBase_Class()
 	 * @see #getProblemStatement()
@@ -1456,6 +1627,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getAffects <em>Affects</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Affects</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getAffects()
 	 * @see #getProblemStatement()
@@ -1467,6 +1639,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getImpact <em>Impact</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Impact</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getImpact()
 	 * @see #getProblemStatement()
@@ -1478,6 +1651,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getProblem <em>Problem</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Problem</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getProblem()
 	 * @see #getProblemStatement()
@@ -1486,9 +1660,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getProblemStatement_Problem();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits <em>Solution Benefits</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits
+	 * <em>Solution Benefits</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Solution Benefits</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits()
 	 * @see #getProblemStatement()
@@ -1500,6 +1676,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning <em>Product Positioning</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Product Positioning</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning
 	 * @generated
@@ -1507,9 +1684,11 @@ public interface NeedsPackage extends EPackage {
 	EClass getProductPositioning();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class <em>Base Class</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class()
 	 * @see #getProductPositioning()
@@ -1518,9 +1697,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getProductPositioning_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds <em>Driving Needs</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds
+	 * <em>Driving Needs</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Driving Needs</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds()
 	 * @see #getProductPositioning()
@@ -1529,9 +1710,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getProductPositioning_DrivingNeeds();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities <em>Key Capabilities</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities
+	 * <em>Key Capabilities</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Key Capabilities</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities()
 	 * @see #getProductPositioning()
@@ -1540,9 +1723,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getProductPositioning_KeyCapabilities();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative
+	 * <em>Primary Competitive Alternative</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Primary Competitive Alternative</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative()
 	 * @see #getProductPositioning()
@@ -1551,9 +1736,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getProductPositioning_PrimaryCompetitiveAlternative();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation <em>Primary Differentiation</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation
+	 * <em>Primary Differentiation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Primary Differentiation</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation()
 	 * @see #getProductPositioning()
@@ -1562,9 +1749,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getProductPositioning_PrimaryDifferentiation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers <em>Target Customers</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers
+	 * <em>Target Customers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Target Customers</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers()
 	 * @see #getProductPositioning()
@@ -1576,6 +1765,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder <em>Stakeholder</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Stakeholder</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Stakeholder
 	 * @generated
@@ -1586,6 +1776,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getBase_Class()
 	 * @see #getStakeholder()
@@ -1594,9 +1785,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getStakeholder_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities <em>Responsibilities</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities
+	 * <em>Responsibilities</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Responsibilities</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities()
 	 * @see #getStakeholder()
@@ -1605,9 +1798,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getStakeholder_Responsibilities();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria <em>Success Criteria</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria
+	 * <em>Success Criteria</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Success Criteria</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria()
 	 * @see #getStakeholder()
@@ -1619,6 +1814,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed <em>Stakeholder Need</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Stakeholder Need</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed
 	 * @generated
@@ -1629,6 +1825,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getBase_Class()
 	 * @see #getStakeholderNeed()
@@ -1640,6 +1837,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getNeed <em>Need</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Need</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getNeed()
 	 * @see #getStakeholderNeed()
@@ -1651,6 +1849,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getPriority <em>Priority</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Priority</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getPriority()
 	 * @see #getStakeholderNeed()
@@ -1659,9 +1858,11 @@ public interface NeedsPackage extends EPackage {
 	EAttribute getStakeholderNeed_Priority();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getProblemStatement <em>Problem Statement</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getProblemStatement
+	 * <em>Problem Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Problem Statement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getProblemStatement()
 	 * @see #getStakeholderNeed()
@@ -1670,9 +1871,11 @@ public interface NeedsPackage extends EPackage {
 	EReference getStakeholderNeed_ProblemStatement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getStakeHolder <em>Stake Holder</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getStakeHolder
+	 * <em>Stake Holder</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Stake Holder</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getStakeHolder()
 	 * @see #getStakeholderNeed()
@@ -1684,6 +1887,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem <em>Vehicle System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Vehicle System</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem
 	 * @generated
@@ -1694,6 +1898,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getFulfills <em>Fulfills</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Fulfills</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getFulfills()
 	 * @see #getVehicleSystem()
@@ -1705,6 +1910,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHas <em>Has</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Has</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHas()
 	 * @see #getVehicleSystem()
@@ -1716,6 +1922,7 @@ public interface NeedsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHasAn <em>Has An</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Has An</em>'.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHasAn()
 	 * @see #getVehicleSystem()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProblemStatement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProblemStatement.java
index df53e6c2542..1fd1e367962 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProblemStatement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProblemStatement.java
@@ -23,37 +23,39 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Problem Statement</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The problem statement represents a brief statement summarizing the problem being solved which gives the opportunity to establish traceability from artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
+ * The problem statement represents a brief statement summarizing the problem being solved which gives the opportunity to establish traceability from
+ * artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
  * 
  * The problem statement could be extended with further modeling of dependencies between different problems and deduction of root problems
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getAffects <em>Affects</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getImpact <em>Impact</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getProblem <em>Problem</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits <em>Solution Benefits</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getAffects <em>Affects</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getImpact <em>Impact</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getProblem <em>Problem</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits <em>Solution Benefits</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement()
  * @model
  * @generated
  */
 public interface ProblemStatement extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement_Base_Class()
@@ -66,7 +68,9 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -77,10 +81,10 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Affects</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Affects</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Affects</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement_Affects()
 	 * @model ordered="false"
@@ -92,10 +96,10 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Impact</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Impact</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Impact</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Impact</em>' attribute.
 	 * @see #setImpact(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement_Impact()
@@ -108,10 +112,10 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Problem</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Problem</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Problem</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Problem</em>' attribute.
 	 * @see #setProblem(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement_Problem()
@@ -124,10 +128,10 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Solution Benefits</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Solution Benefits</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Solution Benefits</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Solution Benefits</em>' attribute.
 	 * @see #setSolutionBenefits(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProblemStatement_SolutionBenefits()
@@ -140,7 +144,9 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getImpact <em>Impact</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Impact</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Impact</em>' attribute.
 	 * @see #getImpact()
 	 * @generated
 	 */
@@ -150,17 +156,22 @@ public interface ProblemStatement extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getProblem <em>Problem</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Problem</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Problem</em>' attribute.
 	 * @see #getProblem()
 	 * @generated
 	 */
 	void setProblem(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits <em>Solution Benefits</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement#getSolutionBenefits <em>Solution Benefits</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Solution Benefits</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Solution Benefits</em>' attribute.
 	 * @see #getSolutionBenefits()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProductPositioning.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProductPositioning.java
index 190d0d1b8e2..022d9660731 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProductPositioning.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/ProductPositioning.java
@@ -21,38 +21,41 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Product Positioning</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The problem positioning represents an overall brief statement summarizing, at the highest level, the unique position the product intends to fill in the marketplace which gives the opportunity to establish traceability from artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
+ * The problem positioning represents an overall brief statement summarizing, at the highest level, the unique position the product intends to fill in
+ * the marketplace which gives the opportunity to establish traceability from artifacts created later, for example to provide rationales to design
+ * decisions or trade-off analysis.
  * 
  * Positioning is assumed to belong to a particular context, typically a system, but also for a smaller part of a system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds <em>Driving Needs</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities <em>Key Capabilities</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation <em>Primary Differentiation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers <em>Target Customers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds <em>Driving Needs</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities <em>Key Capabilities</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation <em>Primary Differentiation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers <em>Target Customers</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning()
  * @model
  * @generated
  */
 public interface ProductPositioning extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_Base_Class()
@@ -65,7 +68,9 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -75,10 +80,10 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Driving Needs</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Driving Needs</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Driving Needs</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Driving Needs</em>' attribute.
 	 * @see #setDrivingNeeds(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_DrivingNeeds()
@@ -91,10 +96,10 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Key Capabilities</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Key Capabilities</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Key Capabilities</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Key Capabilities</em>' attribute.
 	 * @see #setKeyCapabilities(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_KeyCapabilities()
@@ -107,10 +112,10 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Primary Competitive Alternative</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Primary Competitive Alternative</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Primary Competitive Alternative</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Primary Competitive Alternative</em>' attribute.
 	 * @see #setPrimaryCompetitiveAlternative(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_PrimaryCompetitiveAlternative()
@@ -123,10 +128,10 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Primary Differentiation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Primary Differentiation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Primary Differentiation</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Primary Differentiation</em>' attribute.
 	 * @see #setPrimaryDifferentiation(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_PrimaryDifferentiation()
@@ -139,10 +144,10 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Target Customers</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Customers</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Customers</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Customers</em>' attribute.
 	 * @see #setTargetCustomers(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getProductPositioning_TargetCustomers()
@@ -155,47 +160,61 @@ public interface ProductPositioning extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getDrivingNeeds <em>Driving Needs</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Driving Needs</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Driving Needs</em>' attribute.
 	 * @see #getDrivingNeeds()
 	 * @generated
 	 */
 	void setDrivingNeeds(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities <em>Key Capabilities</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getKeyCapabilities <em>Key Capabilities</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key Capabilities</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Key Capabilities</em>' attribute.
 	 * @see #getKeyCapabilities()
 	 * @generated
 	 */
 	void setKeyCapabilities(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryCompetitiveAlternative
+	 * <em>Primary Competitive Alternative</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Competitive Alternative</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Primary Competitive Alternative</em>' attribute.
 	 * @see #getPrimaryCompetitiveAlternative()
 	 * @generated
 	 */
 	void setPrimaryCompetitiveAlternative(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation <em>Primary Differentiation</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getPrimaryDifferentiation
+	 * <em>Primary Differentiation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Differentiation</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Primary Differentiation</em>' attribute.
 	 * @see #getPrimaryDifferentiation()
 	 * @generated
 	 */
 	void setPrimaryDifferentiation(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers <em>Target Customers</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning#getTargetCustomers <em>Target Customers</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Customers</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target Customers</em>' attribute.
 	 * @see #getTargetCustomers()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Stakeholder.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Stakeholder.java
index 9e557e5b28b..a922f46e05c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Stakeholder.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/Stakeholder.java
@@ -21,33 +21,35 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Stakeholder</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The stakeholder represents various roles with regard to the creation and use of architectural descriptions. Stakeholders include clients, users, the architect, developers, and evaluators. [IEEE 1471]
+ * The stakeholder represents various roles with regard to the creation and use of architectural descriptions. Stakeholders include clients, users,
+ * the architect, developers, and evaluators. [IEEE 1471]
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities <em>Responsibilities</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria <em>Success Criteria</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities <em>Responsibilities</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria <em>Success Criteria</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholder()
  * @model
  * @generated
  */
 public interface Stakeholder extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholder_Base_Class()
@@ -60,7 +62,9 @@ public interface Stakeholder extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -70,10 +74,10 @@ public interface Stakeholder extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Responsibilities</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Responsibilities</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Responsibilities</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Responsibilities</em>' attribute.
 	 * @see #setResponsibilities(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholder_Responsibilities()
@@ -86,10 +90,10 @@ public interface Stakeholder extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Success Criteria</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Success Criteria</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Success Criteria</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Success Criteria</em>' attribute.
 	 * @see #setSuccessCriteria(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholder_SuccessCriteria()
@@ -102,7 +106,9 @@ public interface Stakeholder extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getResponsibilities <em>Responsibilities</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Responsibilities</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Responsibilities</em>' attribute.
 	 * @see #getResponsibilities()
 	 * @generated
 	 */
@@ -112,7 +118,9 @@ public interface Stakeholder extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder#getSuccessCriteria <em>Success Criteria</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Success Criteria</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Success Criteria</em>' attribute.
 	 * @see #getSuccessCriteria()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/StakeholderNeed.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/StakeholderNeed.java
index 64045969f60..f0cb61b2277 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/StakeholderNeed.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/StakeholderNeed.java
@@ -23,35 +23,37 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Stakeholder Need</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Stakeholder needs represent a list of the key problems as perceived by the stakeholder, and it gives the opportunity to establish traceability from artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
+ * Stakeholder needs represent a list of the key problems as perceived by the stakeholder, and it gives the opportunity to establish traceability from
+ * artifacts created later, for example to provide rationales to design decisions or trade-off analysis.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getNeed <em>Need</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getStakeHolder <em>Stake Holder</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getProblemStatement <em>Problem Statement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getNeed <em>Need</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getPriority <em>Priority</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getStakeHolder <em>Stake Holder</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getProblemStatement <em>Problem Statement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed()
  * @model
  * @generated
  */
 public interface StakeholderNeed extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed_Base_Class()
@@ -64,7 +66,9 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -74,10 +78,10 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Need</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Need</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Need</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Need</em>' attribute.
 	 * @see #setNeed(String)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed_Need()
@@ -90,10 +94,10 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Priority</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Priority</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Priority</em>' attribute.
 	 * @see #setPriority(int)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed_Priority()
@@ -107,10 +111,10 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Problem Statement</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Problem Statement</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Problem Statement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed_ProblemStatement()
 	 * @model required="true" ordered="false"
@@ -123,10 +127,10 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Stake Holder</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Stake Holder</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Stake Holder</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getStakeholderNeed_StakeHolder()
 	 * @model required="true" ordered="false"
@@ -138,7 +142,9 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getNeed <em>Need</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Need</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Need</em>' attribute.
 	 * @see #getNeed()
 	 * @generated
 	 */
@@ -148,7 +154,9 @@ public interface StakeholderNeed extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed#getPriority <em>Priority</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Priority</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Priority</em>' attribute.
 	 * @see #getPriority()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/VehicleSystem.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/VehicleSystem.java
index 864fd8f2c07..a740045ebdf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/VehicleSystem.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/VehicleSystem.java
@@ -21,34 +21,35 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Vehicle System</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * A collection of components organized to accomplish a specific function or set of functions. [IEEE 1471]
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getFulfills <em>Fulfills</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHasAn <em>Has An</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHas <em>Has</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getFulfills <em>Fulfills</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHasAn <em>Has An</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHas <em>Has</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getVehicleSystem()
  * @model
  * @generated
  */
 public interface VehicleSystem extends Concept {
+
 	/**
 	 * Returns the value of the '<em><b>Fulfills</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.Mission}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fulfills</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Fulfills</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fulfills</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getVehicleSystem_Fulfills()
 	 * @model required="true" ordered="false"
@@ -61,10 +62,10 @@ public interface VehicleSystem extends Concept {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.annex.needs.Stakeholder}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Has</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Has</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Has</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getVehicleSystem_Has()
 	 * @model required="true" ordered="false"
@@ -76,10 +77,10 @@ public interface VehicleSystem extends Concept {
 	 * Returns the value of the '<em><b>Has An</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Has An</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Has An</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Has An</em>' reference.
 	 * @see #setHasAn(Architecture)
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#getVehicleSystem_HasAn()
@@ -92,7 +93,9 @@ public interface VehicleSystem extends Concept {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem#getHasAn <em>Has An</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has An</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Has An</em>' reference.
 	 * @see #getHasAn()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalDescriptionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalDescriptionImpl.java
index 9a04e2b5fe1..7d03629cfda 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalDescriptionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalDescriptionImpl.java
@@ -33,18 +33,20 @@ import org.eclipse.papyrus.eastadl.annex.needs.Stakeholder;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl#getAggregates <em>Aggregates</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl#getIdentifies <em>Identifies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl#getAggregates <em>Aggregates</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitecturalDescriptionImpl#getIdentifies <em>Identifies</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ArchitecturalDescriptionImpl extends ConceptImpl implements ArchitecturalDescription {
+
 	/**
 	 * The cached value of the '{@link #getAggregates() <em>Aggregates</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAggregates()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	 * The cached value of the '{@link #getIdentifies() <em>Identifies</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getIdentifies()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArchitecturalDescriptionImpl() {
@@ -73,15 +77,16 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
-				return getAggregates();
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
-				return getIdentifies();
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
+			return getAggregates();
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
+			return getIdentifies();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -89,15 +94,16 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
-				return aggregates != null && !aggregates.isEmpty();
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
-				return identifies != null && !identifies.isEmpty();
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
+			return aggregates != null && !aggregates.isEmpty();
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
+			return identifies != null && !identifies.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -105,20 +111,21 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
-				getAggregates().clear();
-				getAggregates().addAll((Collection<? extends ArchitecturalModel>)newValue);
-				return;
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
-				getIdentifies().clear();
-				getIdentifies().addAll((Collection<? extends Stakeholder>)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
+			getAggregates().clear();
+			getAggregates().addAll((Collection<? extends ArchitecturalModel>)newValue);
+			return;
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
+			getIdentifies().clear();
+			getIdentifies().addAll((Collection<? extends Stakeholder>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -126,6 +133,7 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,17 +144,18 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
-				getAggregates().clear();
-				return;
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
-				getIdentifies().clear();
-				return;
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES:
+			getAggregates().clear();
+			return;
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES:
+			getIdentifies().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -154,10 +163,11 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ArchitecturalModel> getAggregates() {
-		if (aggregates == null) {
+		if(aggregates == null) {
 			aggregates = new EObjectResolvingEList<ArchitecturalModel>(ArchitecturalModel.class, this, NeedsPackage.ARCHITECTURAL_DESCRIPTION__AGGREGATES);
 		}
 		return aggregates;
@@ -166,10 +176,11 @@ public class ArchitecturalDescriptionImpl extends ConceptImpl implements Archite
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Stakeholder> getIdentifies() {
-		if (identifies == null) {
+		if(identifies == null) {
 			identifies = new EObjectResolvingEList<Stakeholder>(Stakeholder.class, this, NeedsPackage.ARCHITECTURAL_DESCRIPTION__IDENTIFIES);
 		}
 		return identifies;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalModelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalModelImpl.java
index 7262943e948..7be9a5def7c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalModelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitecturalModelImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ArchitecturalModelImpl extends ConceptImpl implements ArchitecturalModel {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArchitecturalModelImpl() {
@@ -42,6 +44,7 @@ public class ArchitecturalModelImpl extends ConceptImpl implements Architectural
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitectureImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitectureImpl.java
index a85a050ed5d..b90b77fd54e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitectureImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ArchitectureImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl#getDescribedBy <em>Described By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ArchitectureImpl#getDescribedBy <em>Described By</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ArchitectureImpl extends ConceptImpl implements Architecture {
+
 	/**
 	 * The cached value of the '{@link #getDescribedBy() <em>Described By</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDescribedBy()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArchitectureImpl() {
@@ -60,6 +63,7 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArchitecturalDescription basicGetDescribedBy() {
@@ -69,14 +73,16 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
-				if (resolve) return getDescribedBy();
-				return basicGetDescribedBy();
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
+			if(resolve)
+				return getDescribedBy();
+			return basicGetDescribedBy();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
-				return describedBy != null;
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
+			return describedBy != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
-				setDescribedBy((ArchitecturalDescription)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
+			setDescribedBy((ArchitecturalDescription)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
-				setDescribedBy((ArchitecturalDescription)null);
-				return;
+		switch(featureID) {
+		case NeedsPackage.ARCHITECTURE__DESCRIBED_BY:
+			setDescribedBy((ArchitecturalDescription)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArchitecturalDescription getDescribedBy() {
-		if (describedBy != null && describedBy.eIsProxy()) {
+		if(describedBy != null && describedBy.eIsProxy()) {
 			InternalEObject oldDescribedBy = (InternalEObject)describedBy;
 			describedBy = (ArchitecturalDescription)eResolveProxy(oldDescribedBy);
-			if (describedBy != oldDescribedBy) {
-				if (eNotificationRequired())
+			if(describedBy != oldDescribedBy) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.ARCHITECTURE__DESCRIBED_BY, oldDescribedBy, describedBy));
 			}
 		}
@@ -155,12 +166,13 @@ public class ArchitectureImpl extends ConceptImpl implements Architecture {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDescribedBy(ArchitecturalDescription newDescribedBy) {
 		ArchitecturalDescription oldDescribedBy = describedBy;
 		describedBy = newDescribedBy;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.ARCHITECTURE__DESCRIBED_BY, oldDescribedBy, describedBy));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/BusinessOpportunityImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/BusinessOpportunityImpl.java
index 0b41669ca15..40adc93d8f5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/BusinessOpportunityImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/BusinessOpportunityImpl.java
@@ -48,20 +48,22 @@ import org.eclipse.uml2.uml.PackageableElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getProblemStatement <em>Problem Statement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getProductPositioning <em>Product Positioning</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getBusinessOpportunity <em>Business Opportunity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getProblemStatement <em>Problem Statement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getProductPositioning <em>Product Positioning</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.BusinessOpportunityImpl#getBusinessOpportunity <em>Business Opportunity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class BusinessOpportunityImpl extends TraceableSpecificationImpl implements BusinessOpportunity {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -72,6 +74,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	 * The cached value of the '{@link #getProblemStatement() <em>Problem Statement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProblemStatement()
 	 * @generated
 	 * @ordered
@@ -82,6 +85,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	 * The cached value of the '{@link #getProductPositioning() <em>Product Positioning</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProductPositioning()
 	 * @generated
 	 * @ordered
@@ -92,6 +96,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	 * The default value of the '{@link #getBusinessOpportunity() <em>Business Opportunity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusinessOpportunity()
 	 * @generated
 	 * @ordered
@@ -102,6 +107,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	 * The cached value of the '{@link #getBusinessOpportunity() <em>Business Opportunity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusinessOpportunity()
 	 * @generated
 	 * @ordered
@@ -111,6 +117,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BusinessOpportunityImpl() {
@@ -120,20 +127,22 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
-				return getProblemStatement();
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
-				return getProductPositioning();
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
-				return getBusinessOpportunity();
+		switch(featureID) {
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
+			return getProblemStatement();
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
+			return getProductPositioning();
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
+			return getBusinessOpportunity();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -141,19 +150,20 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
-				return base_Class != null;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
-				return problemStatement != null && !problemStatement.isEmpty();
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
-				return productPositioning != null && !productPositioning.isEmpty();
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
-				return BUSINESS_OPPORTUNITY_EDEFAULT == null ? businessOpportunity != null : !BUSINESS_OPPORTUNITY_EDEFAULT.equals(businessOpportunity);
+		switch(featureID) {
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
+			return base_Class != null;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
+			return problemStatement != null && !problemStatement.isEmpty();
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
+			return productPositioning != null && !productPositioning.isEmpty();
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
+			return BUSINESS_OPPORTUNITY_EDEFAULT == null ? businessOpportunity != null : !BUSINESS_OPPORTUNITY_EDEFAULT.equals(businessOpportunity);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -161,26 +171,27 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
-				getProblemStatement().clear();
-				getProblemStatement().addAll((Collection<? extends ProblemStatement>)newValue);
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
-				getProductPositioning().clear();
-				getProductPositioning().addAll((Collection<? extends ProductPositioning>)newValue);
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
-				setBusinessOpportunity((String)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
+			getProblemStatement().clear();
+			getProblemStatement().addAll((Collection<? extends ProblemStatement>)newValue);
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
+			getProductPositioning().clear();
+			getProductPositioning().addAll((Collection<? extends ProductPositioning>)newValue);
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
+			setBusinessOpportunity((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -188,6 +199,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,14 +210,15 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -215,6 +228,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -224,35 +238,37 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
-				getProblemStatement().clear();
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
-				getProductPositioning().clear();
-				return;
-			case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
-				setBusinessOpportunity(BUSINESS_OPPORTUNITY_EDEFAULT);
-				return;
+		switch(featureID) {
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT:
+			getProblemStatement().clear();
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING:
+			getProductPositioning().clear();
+			return;
+		case NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY:
+			setBusinessOpportunity(BUSINESS_OPPORTUNITY_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -260,6 +276,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getBusinessOpportunity() {
@@ -269,10 +286,11 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ProblemStatement> getProblemStatement() {
-		if (problemStatement == null) {
+		if(problemStatement == null) {
 			problemStatement = new EObjectResolvingEList<ProblemStatement>(ProblemStatement.class, this, NeedsPackage.BUSINESS_OPPORTUNITY__PROBLEM_STATEMENT);
 		}
 		return problemStatement;
@@ -281,10 +299,11 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ProductPositioning> getProductPositioning() {
-		if (productPositioning == null) {
+		if(productPositioning == null) {
 			productPositioning = new EObjectResolvingEList<ProductPositioning>(ProductPositioning.class, this, NeedsPackage.BUSINESS_OPPORTUNITY__PRODUCT_POSITIONING);
 		}
 		return productPositioning;
@@ -293,23 +312,26 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBusinessOpportunity(String newBusinessOpportunity) {
 		String oldBusinessOpportunity = businessOpportunity;
 		businessOpportunity = newBusinessOpportunity;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.BUSINESS_OPPORTUNITY__BUSINESS_OPPORTUNITY, oldBusinessOpportunity, businessOpportunity));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (businessOpportunity: ");
@@ -327,7 +349,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	@Override
 	public void setBase_PackageableElement(PackageableElement value) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
@@ -351,13 +373,13 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	@Override
 	public void setBase_NamedElement(NamedElement value) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public void setName(String value) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
@@ -429,7 +451,7 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	@Override
 	public void eSet(EStructuralFeature feature, Object newValue) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
@@ -441,12 +463,11 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	@Override
 	public void eUnset(EStructuralFeature feature) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
-	public Object eInvoke(EOperation operation, EList<?> arguments)
-			throws InvocationTargetException {
+	public Object eInvoke(EOperation operation, EList<?> arguments) throws InvocationTargetException {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -466,13 +487,13 @@ public class BusinessOpportunityImpl extends TraceableSpecificationImpl implemen
 	@Override
 	public void eSetDeliver(boolean deliver) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public void eNotify(Notification notification) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 } //BusinessOpportunityImpl
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ConceptImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ConceptImpl.java
index 48f247c1803..1bb7b17579a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ConceptImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ConceptImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ConceptImpl extends EAElementImpl implements Concept {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConceptImpl() {
@@ -43,6 +45,7 @@ public abstract class ConceptImpl extends EAElementImpl implements Concept {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/MissionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/MissionImpl.java
index 014f4d37ebe..de2e488d196 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/MissionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/MissionImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class MissionImpl extends ConceptImpl implements Mission {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MissionImpl() {
@@ -42,6 +44,7 @@ public class MissionImpl extends ConceptImpl implements Mission {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsFactoryImpl.java
index 9134cbd89b7..82e1cd4c216 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.annex.needs.*;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel;
 import org.eclipse.papyrus.eastadl.annex.needs.Architecture;
@@ -38,12 +39,15 @@ import org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -56,16 +60,16 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static NeedsFactory init() {
 		try {
 			NeedsFactory theNeedsFactory = (NeedsFactory)EPackage.Registry.INSTANCE.getEFactory(NeedsPackage.eNS_URI);
-			if (theNeedsFactory != null) {
+			if(theNeedsFactory != null) {
 				return theNeedsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new NeedsFactoryImpl();
@@ -75,6 +79,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsFactoryImpl() {
@@ -84,29 +89,41 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NeedsPackage.STAKEHOLDER: return createStakeholder();
-			case NeedsPackage.STAKEHOLDER_NEED: return createStakeholderNeed();
-			case NeedsPackage.PROBLEM_STATEMENT: return createProblemStatement();
-			case NeedsPackage.PRODUCT_POSITIONING: return createProductPositioning();
-			case NeedsPackage.BUSINESS_OPPORTUNITY: return createBusinessOpportunity();
-			case NeedsPackage.MISSION: return createMission();
-			case NeedsPackage.VEHICLE_SYSTEM: return createVehicleSystem();
-			case NeedsPackage.ARCHITECTURE: return createArchitecture();
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION: return createArchitecturalDescription();
-			case NeedsPackage.ARCHITECTURAL_MODEL: return createArchitecturalModel();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case NeedsPackage.STAKEHOLDER:
+			return createStakeholder();
+		case NeedsPackage.STAKEHOLDER_NEED:
+			return createStakeholderNeed();
+		case NeedsPackage.PROBLEM_STATEMENT:
+			return createProblemStatement();
+		case NeedsPackage.PRODUCT_POSITIONING:
+			return createProductPositioning();
+		case NeedsPackage.BUSINESS_OPPORTUNITY:
+			return createBusinessOpportunity();
+		case NeedsPackage.MISSION:
+			return createMission();
+		case NeedsPackage.VEHICLE_SYSTEM:
+			return createVehicleSystem();
+		case NeedsPackage.ARCHITECTURE:
+			return createArchitecture();
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION:
+			return createArchitecturalDescription();
+		case NeedsPackage.ARCHITECTURAL_MODEL:
+			return createArchitecturalModel();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BusinessOpportunity createBusinessOpportunity() {
@@ -117,6 +134,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Mission createMission() {
@@ -127,6 +145,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VehicleSystem createVehicleSystem() {
@@ -137,6 +156,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Architecture createArchitecture() {
@@ -147,6 +167,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArchitecturalDescription createArchitecturalDescription() {
@@ -157,6 +178,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArchitecturalModel createArchitecturalModel() {
@@ -167,6 +189,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ProblemStatement createProblemStatement() {
@@ -177,6 +200,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ProductPositioning createProductPositioning() {
@@ -187,6 +211,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Stakeholder createStakeholder() {
@@ -197,6 +222,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StakeholderNeed createStakeholderNeed() {
@@ -207,6 +233,7 @@ public class NeedsFactoryImpl extends EFactoryImpl implements NeedsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsPackage getNeedsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsPackageImpl.java
index be83c0e0310..6087b067fae 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/NeedsPackageImpl.java
@@ -97,6 +97,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
@@ -104,6 +105,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stakeholderNeedEClass = null;
@@ -111,6 +113,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass problemStatementEClass = null;
@@ -118,6 +121,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass productPositioningEClass = null;
@@ -125,6 +129,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass businessOpportunityEClass = null;
@@ -132,6 +137,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass conceptEClass = null;
@@ -139,6 +145,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass missionEClass = null;
@@ -146,6 +153,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vehicleSystemEClass = null;
@@ -153,6 +161,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass architectureEClass = null;
@@ -160,6 +169,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass architecturalDescriptionEClass = null;
@@ -167,6 +177,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass architecturalModelEClass = null;
@@ -174,6 +185,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass stakeholderEClass = null;
@@ -181,6 +193,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -188,16 +201,18 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * 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 NeedsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link NeedsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static NeedsPackage init() {
-		if (isInited) return (NeedsPackage)EPackage.Registry.INSTANCE.getEPackage(NeedsPackage.eNS_URI);
+		if(isInited)
+			return (NeedsPackage)EPackage.Registry.INSTANCE.getEPackage(NeedsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		NeedsPackageImpl theNeedsPackage = (NeedsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NeedsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NeedsPackageImpl());
@@ -299,7 +314,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 		// Mark meta-data to indicate it can't be changed
 		theNeedsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(NeedsPackage.eNS_URI, theNeedsPackage);
 		return theNeedsPackage;
@@ -308,6 +323,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -315,19 +331,19 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage#eNS_URI
 	 * @see #init()
@@ -338,14 +354,16 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -405,39 +423,20 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	 * Initializes the annotations for <b>redefines</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createRedefinesAnnotations() {
-		String source = "redefines";				
-		addAnnotation
-		  (getStakeholderNeed_Need(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note")
-		   });			
-		addAnnotation
-		  (getProblemStatement_Problem(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note")
-		   });				
-		addAnnotation
-		  (getBusinessOpportunity_BusinessOpportunity(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note")
-		   });						
+		String source = "redefines";
+		addAnnotation(getStakeholderNeed_Need(), source, new String[]{}, new URI[]{ URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note") });
+		addAnnotation(getProblemStatement_Problem(), source, new String[]{}, new URI[]{ URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note") });
+		addAnnotation(getBusinessOpportunity_BusinessOpportunity(), source, new String[]{}, new URI[]{ URI.createURI(EastadlPackage.eNS_URI).appendFragment("//infrastructure/elements/TraceableSpecification/note") });
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getArchitecturalDescription() {
@@ -447,6 +446,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getArchitecturalDescription_Aggregates() {
@@ -456,6 +456,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getArchitecturalDescription_Identifies() {
@@ -465,6 +466,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getArchitecturalModel() {
@@ -474,6 +476,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getArchitecture() {
@@ -483,6 +486,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getArchitecture_DescribedBy() {
@@ -492,6 +496,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBusinessOpportunity() {
@@ -501,6 +506,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getBusinessOpportunity_Base_Class() {
@@ -510,6 +516,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBusinessOpportunity_BusinessOpportunity() {
@@ -519,6 +526,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getBusinessOpportunity_ProblemStatement() {
@@ -528,6 +536,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getBusinessOpportunity_ProductPositioning() {
@@ -537,6 +546,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getConcept() {
@@ -546,6 +556,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMission() {
@@ -555,6 +566,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsFactory getNeedsFactory() {
@@ -564,6 +576,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getProblemStatement() {
@@ -573,6 +586,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getProblemStatement_Base_Class() {
@@ -582,6 +596,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getProblemStatement_Affects() {
@@ -591,6 +606,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProblemStatement_Impact() {
@@ -600,6 +616,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProblemStatement_Problem() {
@@ -609,6 +626,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProblemStatement_SolutionBenefits() {
@@ -618,6 +636,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getProductPositioning() {
@@ -627,6 +646,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getProductPositioning_Base_Class() {
@@ -636,6 +656,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProductPositioning_DrivingNeeds() {
@@ -645,6 +666,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProductPositioning_KeyCapabilities() {
@@ -654,6 +676,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProductPositioning_PrimaryCompetitiveAlternative() {
@@ -663,6 +686,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProductPositioning_PrimaryDifferentiation() {
@@ -672,6 +696,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProductPositioning_TargetCustomers() {
@@ -681,6 +706,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStakeholder() {
@@ -690,6 +716,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStakeholder_Base_Class() {
@@ -699,6 +726,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStakeholder_Responsibilities() {
@@ -708,6 +736,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStakeholder_SuccessCriteria() {
@@ -717,6 +746,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStakeholderNeed() {
@@ -726,6 +756,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStakeholderNeed_Base_Class() {
@@ -735,6 +766,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStakeholderNeed_Need() {
@@ -744,6 +776,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStakeholderNeed_Priority() {
@@ -753,6 +786,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStakeholderNeed_ProblemStatement() {
@@ -762,6 +796,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStakeholderNeed_StakeHolder() {
@@ -771,6 +806,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVehicleSystem() {
@@ -780,6 +816,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleSystem_Fulfills() {
@@ -789,6 +826,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleSystem_Has() {
@@ -798,6 +836,7 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleSystem_HasAn() {
@@ -805,14 +844,16 @@ public class NeedsPackageImpl extends EPackageImpl implements NeedsPackage {
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProblemStatementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProblemStatementImpl.java
index 14c014025be..2c06f09398b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProblemStatementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProblemStatementImpl.java
@@ -36,21 +36,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getAffects <em>Affects</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getImpact <em>Impact</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getProblem <em>Problem</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getSolutionBenefits <em>Solution Benefits</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getAffects <em>Affects</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getImpact <em>Impact</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getProblem <em>Problem</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProblemStatementImpl#getSolutionBenefits <em>Solution Benefits</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ProblemStatementImpl extends TraceableSpecificationImpl implements ProblemStatement {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getAffects() <em>Affects</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAffects()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The default value of the '{@link #getImpact() <em>Impact</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getImpact()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getImpact() <em>Impact</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getImpact()
 	 * @generated
 	 * @ordered
@@ -91,6 +96,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The default value of the '{@link #getProblem() <em>Problem</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProblem()
 	 * @generated
 	 * @ordered
@@ -101,6 +107,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getProblem() <em>Problem</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProblem()
 	 * @generated
 	 * @ordered
@@ -111,6 +118,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The default value of the '{@link #getSolutionBenefits() <em>Solution Benefits</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSolutionBenefits()
 	 * @generated
 	 * @ordered
@@ -121,6 +129,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getSolutionBenefits() <em>Solution Benefits</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSolutionBenefits()
 	 * @generated
 	 * @ordered
@@ -130,6 +139,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProblemStatementImpl() {
@@ -139,22 +149,24 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
-				return getAffects();
-			case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
-				return getImpact();
-			case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
-				return getProblem();
-			case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
-				return getSolutionBenefits();
+		switch(featureID) {
+		case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
+			return getAffects();
+		case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
+			return getImpact();
+		case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
+			return getProblem();
+		case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
+			return getSolutionBenefits();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -162,21 +174,22 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
-				return base_Class != null;
-			case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
-				return affects != null && !affects.isEmpty();
-			case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
-				return IMPACT_EDEFAULT == null ? impact != null : !IMPACT_EDEFAULT.equals(impact);
-			case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
-				return PROBLEM_EDEFAULT == null ? problem != null : !PROBLEM_EDEFAULT.equals(problem);
-			case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
-				return SOLUTION_BENEFITS_EDEFAULT == null ? solutionBenefits != null : !SOLUTION_BENEFITS_EDEFAULT.equals(solutionBenefits);
+		switch(featureID) {
+		case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
+			return base_Class != null;
+		case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
+			return affects != null && !affects.isEmpty();
+		case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
+			return IMPACT_EDEFAULT == null ? impact != null : !IMPACT_EDEFAULT.equals(impact);
+		case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
+			return PROBLEM_EDEFAULT == null ? problem != null : !PROBLEM_EDEFAULT.equals(problem);
+		case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
+			return SOLUTION_BENEFITS_EDEFAULT == null ? solutionBenefits != null : !SOLUTION_BENEFITS_EDEFAULT.equals(solutionBenefits);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -184,28 +197,29 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
-				getAffects().clear();
-				getAffects().addAll((Collection<? extends Stakeholder>)newValue);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
-				setImpact((String)newValue);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
-				setProblem((String)newValue);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
-				setSolutionBenefits((String)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
+			getAffects().clear();
+			getAffects().addAll((Collection<? extends Stakeholder>)newValue);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
+			setImpact((String)newValue);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
+			setProblem((String)newValue);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
+			setSolutionBenefits((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -213,6 +227,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -223,14 +238,15 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -240,6 +256,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -249,38 +266,40 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
-				getAffects().clear();
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
-				setImpact(IMPACT_EDEFAULT);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
-				setProblem(PROBLEM_EDEFAULT);
-				return;
-			case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
-				setSolutionBenefits(SOLUTION_BENEFITS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case NeedsPackage.PROBLEM_STATEMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__AFFECTS:
+			getAffects().clear();
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__IMPACT:
+			setImpact(IMPACT_EDEFAULT);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__PROBLEM:
+			setProblem(PROBLEM_EDEFAULT);
+			return;
+		case NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS:
+			setSolutionBenefits(SOLUTION_BENEFITS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -288,10 +307,11 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Stakeholder> getAffects() {
-		if (affects == null) {
+		if(affects == null) {
 			affects = new EObjectResolvingEList<Stakeholder>(Stakeholder.class, this, NeedsPackage.PROBLEM_STATEMENT__AFFECTS);
 		}
 		return affects;
@@ -300,6 +320,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getImpact() {
@@ -309,6 +330,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getProblem() {
@@ -318,6 +340,7 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSolutionBenefits() {
@@ -327,47 +350,52 @@ public class ProblemStatementImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImpact(String newImpact) {
 		String oldImpact = impact;
 		impact = newImpact;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PROBLEM_STATEMENT__IMPACT, oldImpact, impact));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setProblem(String newProblem) {
 		String oldProblem = problem;
 		problem = newProblem;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PROBLEM_STATEMENT__PROBLEM, oldProblem, problem));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSolutionBenefits(String newSolutionBenefits) {
 		String oldSolutionBenefits = solutionBenefits;
 		solutionBenefits = newSolutionBenefits;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PROBLEM_STATEMENT__SOLUTION_BENEFITS, oldSolutionBenefits, solutionBenefits));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (impact: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProductPositioningImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProductPositioningImpl.java
index 9613a1f3daa..e665caa52bb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProductPositioningImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/ProductPositioningImpl.java
@@ -31,22 +31,25 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getDrivingNeeds <em>Driving Needs</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getKeyCapabilities <em>Key Capabilities</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getPrimaryDifferentiation <em>Primary Differentiation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getTargetCustomers <em>Target Customers</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getDrivingNeeds <em>Driving Needs</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getKeyCapabilities <em>Key Capabilities</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getPrimaryCompetitiveAlternative <em>Primary Competitive Alternative
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getPrimaryDifferentiation <em>Primary Differentiation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.ProductPositioningImpl#getTargetCustomers <em>Target Customers</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ProductPositioningImpl extends TraceableSpecificationImpl implements ProductPositioning {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -57,6 +60,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The default value of the '{@link #getDrivingNeeds() <em>Driving Needs</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDrivingNeeds()
 	 * @generated
 	 * @ordered
@@ -67,6 +71,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The cached value of the '{@link #getDrivingNeeds() <em>Driving Needs</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDrivingNeeds()
 	 * @generated
 	 * @ordered
@@ -77,6 +82,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The default value of the '{@link #getKeyCapabilities() <em>Key Capabilities</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKeyCapabilities()
 	 * @generated
 	 * @ordered
@@ -87,6 +93,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The cached value of the '{@link #getKeyCapabilities() <em>Key Capabilities</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKeyCapabilities()
 	 * @generated
 	 * @ordered
@@ -97,6 +104,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The default value of the '{@link #getPrimaryCompetitiveAlternative() <em>Primary Competitive Alternative</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrimaryCompetitiveAlternative()
 	 * @generated
 	 * @ordered
@@ -107,6 +115,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The cached value of the '{@link #getPrimaryCompetitiveAlternative() <em>Primary Competitive Alternative</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrimaryCompetitiveAlternative()
 	 * @generated
 	 * @ordered
@@ -117,6 +126,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The default value of the '{@link #getPrimaryDifferentiation() <em>Primary Differentiation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrimaryDifferentiation()
 	 * @generated
 	 * @ordered
@@ -127,6 +137,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The cached value of the '{@link #getPrimaryDifferentiation() <em>Primary Differentiation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrimaryDifferentiation()
 	 * @generated
 	 * @ordered
@@ -137,6 +148,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The default value of the '{@link #getTargetCustomers() <em>Target Customers</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetCustomers()
 	 * @generated
 	 * @ordered
@@ -147,6 +159,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	 * The cached value of the '{@link #getTargetCustomers() <em>Target Customers</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetCustomers()
 	 * @generated
 	 * @ordered
@@ -156,6 +169,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProductPositioningImpl() {
@@ -165,24 +179,26 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
-				return getDrivingNeeds();
-			case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
-				return getKeyCapabilities();
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
-				return getPrimaryCompetitiveAlternative();
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
-				return getPrimaryDifferentiation();
-			case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
-				return getTargetCustomers();
+		switch(featureID) {
+		case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
+			return getDrivingNeeds();
+		case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
+			return getKeyCapabilities();
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
+			return getPrimaryCompetitiveAlternative();
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
+			return getPrimaryDifferentiation();
+		case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
+			return getTargetCustomers();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -190,23 +206,24 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
-				return base_Class != null;
-			case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
-				return DRIVING_NEEDS_EDEFAULT == null ? drivingNeeds != null : !DRIVING_NEEDS_EDEFAULT.equals(drivingNeeds);
-			case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
-				return KEY_CAPABILITIES_EDEFAULT == null ? keyCapabilities != null : !KEY_CAPABILITIES_EDEFAULT.equals(keyCapabilities);
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
-				return PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT == null ? primaryCompetitiveAlternative != null : !PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT.equals(primaryCompetitiveAlternative);
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
-				return PRIMARY_DIFFERENTIATION_EDEFAULT == null ? primaryDifferentiation != null : !PRIMARY_DIFFERENTIATION_EDEFAULT.equals(primaryDifferentiation);
-			case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
-				return TARGET_CUSTOMERS_EDEFAULT == null ? targetCustomers != null : !TARGET_CUSTOMERS_EDEFAULT.equals(targetCustomers);
+		switch(featureID) {
+		case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
+			return base_Class != null;
+		case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
+			return DRIVING_NEEDS_EDEFAULT == null ? drivingNeeds != null : !DRIVING_NEEDS_EDEFAULT.equals(drivingNeeds);
+		case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
+			return KEY_CAPABILITIES_EDEFAULT == null ? keyCapabilities != null : !KEY_CAPABILITIES_EDEFAULT.equals(keyCapabilities);
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
+			return PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT == null ? primaryCompetitiveAlternative != null : !PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT.equals(primaryCompetitiveAlternative);
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
+			return PRIMARY_DIFFERENTIATION_EDEFAULT == null ? primaryDifferentiation != null : !PRIMARY_DIFFERENTIATION_EDEFAULT.equals(primaryDifferentiation);
+		case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
+			return TARGET_CUSTOMERS_EDEFAULT == null ? targetCustomers != null : !TARGET_CUSTOMERS_EDEFAULT.equals(targetCustomers);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -214,29 +231,30 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
-				setDrivingNeeds((String)newValue);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
-				setKeyCapabilities((String)newValue);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
-				setPrimaryCompetitiveAlternative((String)newValue);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
-				setPrimaryDifferentiation((String)newValue);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
-				setTargetCustomers((String)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
+			setDrivingNeeds((String)newValue);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
+			setKeyCapabilities((String)newValue);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
+			setPrimaryCompetitiveAlternative((String)newValue);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
+			setPrimaryDifferentiation((String)newValue);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
+			setTargetCustomers((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -244,6 +262,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,14 +273,15 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -271,6 +291,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -280,41 +301,43 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
-				setDrivingNeeds(DRIVING_NEEDS_EDEFAULT);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
-				setKeyCapabilities(KEY_CAPABILITIES_EDEFAULT);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
-				setPrimaryCompetitiveAlternative(PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
-				setPrimaryDifferentiation(PRIMARY_DIFFERENTIATION_EDEFAULT);
-				return;
-			case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
-				setTargetCustomers(TARGET_CUSTOMERS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case NeedsPackage.PRODUCT_POSITIONING__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS:
+			setDrivingNeeds(DRIVING_NEEDS_EDEFAULT);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES:
+			setKeyCapabilities(KEY_CAPABILITIES_EDEFAULT);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE:
+			setPrimaryCompetitiveAlternative(PRIMARY_COMPETITIVE_ALTERNATIVE_EDEFAULT);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION:
+			setPrimaryDifferentiation(PRIMARY_DIFFERENTIATION_EDEFAULT);
+			return;
+		case NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS:
+			setTargetCustomers(TARGET_CUSTOMERS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -322,6 +345,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDrivingNeeds() {
@@ -331,6 +355,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getKeyCapabilities() {
@@ -340,6 +365,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getPrimaryCompetitiveAlternative() {
@@ -349,6 +375,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getPrimaryDifferentiation() {
@@ -358,6 +385,7 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTargetCustomers() {
@@ -367,71 +395,78 @@ public class ProductPositioningImpl extends TraceableSpecificationImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDrivingNeeds(String newDrivingNeeds) {
 		String oldDrivingNeeds = drivingNeeds;
 		drivingNeeds = newDrivingNeeds;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__DRIVING_NEEDS, oldDrivingNeeds, drivingNeeds));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKeyCapabilities(String newKeyCapabilities) {
 		String oldKeyCapabilities = keyCapabilities;
 		keyCapabilities = newKeyCapabilities;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__KEY_CAPABILITIES, oldKeyCapabilities, keyCapabilities));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPrimaryCompetitiveAlternative(String newPrimaryCompetitiveAlternative) {
 		String oldPrimaryCompetitiveAlternative = primaryCompetitiveAlternative;
 		primaryCompetitiveAlternative = newPrimaryCompetitiveAlternative;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__PRIMARY_COMPETITIVE_ALTERNATIVE, oldPrimaryCompetitiveAlternative, primaryCompetitiveAlternative));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPrimaryDifferentiation(String newPrimaryDifferentiation) {
 		String oldPrimaryDifferentiation = primaryDifferentiation;
 		primaryDifferentiation = newPrimaryDifferentiation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__PRIMARY_DIFFERENTIATION, oldPrimaryDifferentiation, primaryDifferentiation));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetCustomers(String newTargetCustomers) {
 		String oldTargetCustomers = targetCustomers;
 		targetCustomers = newTargetCustomers;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.PRODUCT_POSITIONING__TARGET_CUSTOMERS, oldTargetCustomers, targetCustomers));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (drivingNeeds: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderImpl.java
index 796c9cb5684..0b57bc39b10 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderImpl.java
@@ -31,19 +31,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getResponsibilities <em>Responsibilities</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getSuccessCriteria <em>Success Criteria</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getResponsibilities <em>Responsibilities</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderImpl#getSuccessCriteria <em>Success Criteria</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class StakeholderImpl extends TraceableSpecificationImpl implements Stakeholder {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	 * The default value of the '{@link #getResponsibilities() <em>Responsibilities</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResponsibilities()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	 * The cached value of the '{@link #getResponsibilities() <em>Responsibilities</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResponsibilities()
 	 * @generated
 	 * @ordered
@@ -74,6 +78,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	 * The default value of the '{@link #getSuccessCriteria() <em>Success Criteria</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSuccessCriteria()
 	 * @generated
 	 * @ordered
@@ -84,6 +89,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	 * The cached value of the '{@link #getSuccessCriteria() <em>Success Criteria</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSuccessCriteria()
 	 * @generated
 	 * @ordered
@@ -93,6 +99,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StakeholderImpl() {
@@ -102,18 +109,20 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
-				return getResponsibilities();
-			case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
-				return getSuccessCriteria();
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
+			return getResponsibilities();
+		case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
+			return getSuccessCriteria();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -121,17 +130,18 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER__BASE_CLASS:
-				return base_Class != null;
-			case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
-				return RESPONSIBILITIES_EDEFAULT == null ? responsibilities != null : !RESPONSIBILITIES_EDEFAULT.equals(responsibilities);
-			case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
-				return SUCCESS_CRITERIA_EDEFAULT == null ? successCriteria != null : !SUCCESS_CRITERIA_EDEFAULT.equals(successCriteria);
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER__BASE_CLASS:
+			return base_Class != null;
+		case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
+			return RESPONSIBILITIES_EDEFAULT == null ? responsibilities != null : !RESPONSIBILITIES_EDEFAULT.equals(responsibilities);
+		case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
+			return SUCCESS_CRITERIA_EDEFAULT == null ? successCriteria != null : !SUCCESS_CRITERIA_EDEFAULT.equals(successCriteria);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -139,20 +149,21 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
-				setResponsibilities((String)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
-				setSuccessCriteria((String)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
+			setResponsibilities((String)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
+			setSuccessCriteria((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -160,6 +171,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,14 +182,15 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.STAKEHOLDER__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -187,6 +200,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -196,32 +210,34 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
-				setResponsibilities(RESPONSIBILITIES_EDEFAULT);
-				return;
-			case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
-				setSuccessCriteria(SUCCESS_CRITERIA_EDEFAULT);
-				return;
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case NeedsPackage.STAKEHOLDER__RESPONSIBILITIES:
+			setResponsibilities(RESPONSIBILITIES_EDEFAULT);
+			return;
+		case NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA:
+			setSuccessCriteria(SUCCESS_CRITERIA_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -229,6 +245,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getResponsibilities() {
@@ -238,6 +255,7 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSuccessCriteria() {
@@ -247,35 +265,39 @@ public class StakeholderImpl extends TraceableSpecificationImpl implements Stake
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setResponsibilities(String newResponsibilities) {
 		String oldResponsibilities = responsibilities;
 		responsibilities = newResponsibilities;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER__RESPONSIBILITIES, oldResponsibilities, responsibilities));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSuccessCriteria(String newSuccessCriteria) {
 		String oldSuccessCriteria = successCriteria;
 		successCriteria = newSuccessCriteria;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER__SUCCESS_CRITERIA, oldSuccessCriteria, successCriteria));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (responsibilities: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderNeedImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderNeedImpl.java
index aa61c5e6bd8..15ea924db95 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderNeedImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/StakeholderNeedImpl.java
@@ -37,21 +37,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getNeed <em>Need</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getStakeHolder <em>Stake Holder</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getProblemStatement <em>Problem Statement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getNeed <em>Need</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getPriority <em>Priority</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getStakeHolder <em>Stake Holder</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.StakeholderNeedImpl#getProblemStatement <em>Problem Statement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class StakeholderNeedImpl extends TraceableSpecificationImpl implements StakeholderNeed {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -62,6 +64,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The default value of the '{@link #getNeed() <em>Need</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNeed()
 	 * @generated
 	 * @ordered
@@ -72,6 +75,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The cached value of the '{@link #getNeed() <em>Need</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNeed()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPriority()
 	 * @generated
 	 * @ordered
@@ -92,6 +97,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPriority()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The cached value of the '{@link #getStakeHolder() <em>Stake Holder</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getStakeHolder()
 	 * @generated
 	 * @ordered
@@ -112,6 +119,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	 * The cached value of the '{@link #getProblemStatement() <em>Problem Statement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProblemStatement()
 	 * @generated
 	 * @ordered
@@ -121,6 +129,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StakeholderNeedImpl() {
@@ -130,22 +139,24 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case NeedsPackage.STAKEHOLDER_NEED__NEED:
-				return getNeed();
-			case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
-				return getPriority();
-			case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
-				return getStakeHolder();
-			case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
-				return getProblemStatement();
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case NeedsPackage.STAKEHOLDER_NEED__NEED:
+			return getNeed();
+		case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
+			return getPriority();
+		case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
+			return getStakeHolder();
+		case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
+			return getProblemStatement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -153,21 +164,22 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
-				return base_Class != null;
-			case NeedsPackage.STAKEHOLDER_NEED__NEED:
-				return NEED_EDEFAULT == null ? need != null : !NEED_EDEFAULT.equals(need);
-			case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
-			case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
-				return stakeHolder != null && !stakeHolder.isEmpty();
-			case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
-				return problemStatement != null && !problemStatement.isEmpty();
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
+			return base_Class != null;
+		case NeedsPackage.STAKEHOLDER_NEED__NEED:
+			return NEED_EDEFAULT == null ? need != null : !NEED_EDEFAULT.equals(need);
+		case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
+			return priority != PRIORITY_EDEFAULT;
+		case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
+			return stakeHolder != null && !stakeHolder.isEmpty();
+		case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
+			return problemStatement != null && !problemStatement.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -175,29 +187,30 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__NEED:
-				setNeed((String)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
-				setPriority((Integer)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
-				getStakeHolder().clear();
-				getStakeHolder().addAll((Collection<? extends Stakeholder>)newValue);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
-				getProblemStatement().clear();
-				getProblemStatement().addAll((Collection<? extends ProblemStatement>)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__NEED:
+			setNeed((String)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
+			setPriority((Integer)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
+			getStakeHolder().clear();
+			getStakeHolder().addAll((Collection<? extends Stakeholder>)newValue);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
+			getProblemStatement().clear();
+			getProblemStatement().addAll((Collection<? extends ProblemStatement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -205,6 +218,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,14 +229,15 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -232,6 +247,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -241,38 +257,40 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__NEED:
-				setNeed(NEED_EDEFAULT);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
-				getStakeHolder().clear();
-				return;
-			case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
-				getProblemStatement().clear();
-				return;
+		switch(featureID) {
+		case NeedsPackage.STAKEHOLDER_NEED__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__NEED:
+			setNeed(NEED_EDEFAULT);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__PRIORITY:
+			setPriority(PRIORITY_EDEFAULT);
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER:
+			getStakeHolder().clear();
+			return;
+		case NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT:
+			getProblemStatement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -280,6 +298,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getNeed() {
@@ -289,6 +308,7 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getPriority() {
@@ -298,10 +318,11 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ProblemStatement> getProblemStatement() {
-		if (problemStatement == null) {
+		if(problemStatement == null) {
 			problemStatement = new EObjectResolvingEList<ProblemStatement>(ProblemStatement.class, this, NeedsPackage.STAKEHOLDER_NEED__PROBLEM_STATEMENT);
 		}
 		return problemStatement;
@@ -310,10 +331,11 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Stakeholder> getStakeHolder() {
-		if (stakeHolder == null) {
+		if(stakeHolder == null) {
 			stakeHolder = new EObjectResolvingEList<Stakeholder>(Stakeholder.class, this, NeedsPackage.STAKEHOLDER_NEED__STAKE_HOLDER);
 		}
 		return stakeHolder;
@@ -322,35 +344,39 @@ public class StakeholderNeedImpl extends TraceableSpecificationImpl implements S
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNeed(String newNeed) {
 		String oldNeed = need;
 		need = newNeed;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER_NEED__NEED, oldNeed, need));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPriority(int newPriority) {
 		int oldPriority = priority;
 		priority = newPriority;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.STAKEHOLDER_NEED__PRIORITY, oldPriority, priority));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (need: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/VehicleSystemImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/VehicleSystemImpl.java
index c4dd24d7617..990498eb18b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/VehicleSystemImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/impl/VehicleSystemImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getFulfills <em>Fulfills</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getHasAn <em>Has An</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getHas <em>Has</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getFulfills <em>Fulfills</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getHasAn <em>Has An</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.annex.needs.impl.VehicleSystemImpl#getHas <em>Has</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
+
 	/**
 	 * The cached value of the '{@link #getFulfills() <em>Fulfills</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFulfills()
 	 * @generated
 	 * @ordered
@@ -60,6 +62,7 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	 * The cached value of the '{@link #getHasAn() <em>Has An</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHasAn()
 	 * @generated
 	 * @ordered
@@ -70,6 +73,7 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	 * The cached value of the '{@link #getHas() <em>Has</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHas()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VehicleSystemImpl() {
@@ -88,6 +93,7 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Architecture basicGetHasAn() {
@@ -97,18 +103,20 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
-				return getFulfills();
-			case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
-				if (resolve) return getHasAn();
-				return basicGetHasAn();
-			case NeedsPackage.VEHICLE_SYSTEM__HAS:
-				return getHas();
+		switch(featureID) {
+		case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
+			return getFulfills();
+		case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
+			if(resolve)
+				return getHasAn();
+			return basicGetHasAn();
+		case NeedsPackage.VEHICLE_SYSTEM__HAS:
+			return getHas();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -116,17 +124,18 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
-				return fulfills != null && !fulfills.isEmpty();
-			case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
-				return hasAn != null;
-			case NeedsPackage.VEHICLE_SYSTEM__HAS:
-				return has != null && !has.isEmpty();
+		switch(featureID) {
+		case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
+			return fulfills != null && !fulfills.isEmpty();
+		case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
+			return hasAn != null;
+		case NeedsPackage.VEHICLE_SYSTEM__HAS:
+			return has != null && !has.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -134,23 +143,24 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
-				getFulfills().clear();
-				getFulfills().addAll((Collection<? extends Mission>)newValue);
-				return;
-			case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
-				setHasAn((Architecture)newValue);
-				return;
-			case NeedsPackage.VEHICLE_SYSTEM__HAS:
-				getHas().clear();
-				getHas().addAll((Collection<? extends Stakeholder>)newValue);
-				return;
+		switch(featureID) {
+		case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
+			getFulfills().clear();
+			getFulfills().addAll((Collection<? extends Mission>)newValue);
+			return;
+		case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
+			setHasAn((Architecture)newValue);
+			return;
+		case NeedsPackage.VEHICLE_SYSTEM__HAS:
+			getHas().clear();
+			getHas().addAll((Collection<? extends Stakeholder>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -158,6 +168,7 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,20 +179,21 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
-				getFulfills().clear();
-				return;
-			case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
-				setHasAn((Architecture)null);
-				return;
-			case NeedsPackage.VEHICLE_SYSTEM__HAS:
-				getHas().clear();
-				return;
+		switch(featureID) {
+		case NeedsPackage.VEHICLE_SYSTEM__FULFILLS:
+			getFulfills().clear();
+			return;
+		case NeedsPackage.VEHICLE_SYSTEM__HAS_AN:
+			setHasAn((Architecture)null);
+			return;
+		case NeedsPackage.VEHICLE_SYSTEM__HAS:
+			getHas().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -189,10 +201,11 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mission> getFulfills() {
-		if (fulfills == null) {
+		if(fulfills == null) {
 			fulfills = new EObjectResolvingEList<Mission>(Mission.class, this, NeedsPackage.VEHICLE_SYSTEM__FULFILLS);
 		}
 		return fulfills;
@@ -201,10 +214,11 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Stakeholder> getHas() {
-		if (has == null) {
+		if(has == null) {
 			has = new EObjectResolvingEList<Stakeholder>(Stakeholder.class, this, NeedsPackage.VEHICLE_SYSTEM__HAS);
 		}
 		return has;
@@ -213,14 +227,15 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Architecture getHasAn() {
-		if (hasAn != null && hasAn.eIsProxy()) {
+		if(hasAn != null && hasAn.eIsProxy()) {
 			InternalEObject oldHasAn = (InternalEObject)hasAn;
 			hasAn = (Architecture)eResolveProxy(oldHasAn);
-			if (hasAn != oldHasAn) {
-				if (eNotificationRequired())
+			if(hasAn != oldHasAn) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NeedsPackage.VEHICLE_SYSTEM__HAS_AN, oldHasAn, hasAn));
 			}
 		}
@@ -230,12 +245,13 @@ public class VehicleSystemImpl extends ConceptImpl implements VehicleSystem {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHasAn(Architecture newHasAn) {
 		Architecture oldHasAn = hasAn;
 		hasAn = newHasAn;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NeedsPackage.VEHICLE_SYSTEM__HAS_AN, oldHasAn, hasAn));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsAdapterFactory.java
index 34f9a173d87..080d88da227 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.annex.needs.*;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel;
 import org.eclipse.papyrus.eastadl.annex.needs.Architecture;
@@ -41,14 +42,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage
  * @generated
  */
 public class NeedsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static NeedsPackage modelPackage;
@@ -57,80 +61,96 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected NeedsSwitch<Adapter> modelSwitch =
-		new NeedsSwitch<Adapter>() {
-			@Override
-			public Adapter caseStakeholder(Stakeholder object) {
-				return createStakeholderAdapter();
-			}
-			@Override
-			public Adapter caseStakeholderNeed(StakeholderNeed object) {
-				return createStakeholderNeedAdapter();
-			}
-			@Override
-			public Adapter caseProblemStatement(ProblemStatement object) {
-				return createProblemStatementAdapter();
-			}
-			@Override
-			public Adapter caseProductPositioning(ProductPositioning object) {
-				return createProductPositioningAdapter();
-			}
-			@Override
-			public Adapter caseBusinessOpportunity(BusinessOpportunity object) {
-				return createBusinessOpportunityAdapter();
-			}
-			@Override
-			public Adapter caseConcept(Concept object) {
-				return createConceptAdapter();
-			}
-			@Override
-			public Adapter caseMission(Mission object) {
-				return createMissionAdapter();
-			}
-			@Override
-			public Adapter caseVehicleSystem(VehicleSystem object) {
-				return createVehicleSystemAdapter();
-			}
-			@Override
-			public Adapter caseArchitecture(Architecture object) {
-				return createArchitectureAdapter();
-			}
-			@Override
-			public Adapter caseArchitecturalDescription(ArchitecturalDescription object) {
-				return createArchitecturalDescriptionAdapter();
-			}
-			@Override
-			public Adapter caseArchitecturalModel(ArchitecturalModel object) {
-				return createArchitecturalModelAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected NeedsSwitch<Adapter> modelSwitch = new NeedsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseStakeholder(Stakeholder object) {
+			return createStakeholderAdapter();
+		}
+
+		@Override
+		public Adapter caseStakeholderNeed(StakeholderNeed object) {
+			return createStakeholderNeedAdapter();
+		}
+
+		@Override
+		public Adapter caseProblemStatement(ProblemStatement object) {
+			return createProblemStatementAdapter();
+		}
+
+		@Override
+		public Adapter caseProductPositioning(ProductPositioning object) {
+			return createProductPositioningAdapter();
+		}
+
+		@Override
+		public Adapter caseBusinessOpportunity(BusinessOpportunity object) {
+			return createBusinessOpportunityAdapter();
+		}
+
+		@Override
+		public Adapter caseConcept(Concept object) {
+			return createConceptAdapter();
+		}
+
+		@Override
+		public Adapter caseMission(Mission object) {
+			return createMissionAdapter();
+		}
+
+		@Override
+		public Adapter caseVehicleSystem(VehicleSystem object) {
+			return createVehicleSystemAdapter();
+		}
+
+		@Override
+		public Adapter caseArchitecture(Architecture object) {
+			return createArchitectureAdapter();
+		}
+
+		@Override
+		public Adapter caseArchitecturalDescription(ArchitecturalDescription object) {
+			return createArchitecturalDescriptionAdapter();
+		}
+
+		@Override
+		public Adapter caseArchitecturalModel(ArchitecturalModel object) {
+			return createArchitecturalModelAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = NeedsPackage.eINSTANCE;
 		}
 	}
@@ -139,7 +159,9 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -149,11 +171,13 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription <em>Architectural Description</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription
+	 * <em>Architectural Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription
 	 * @generated
@@ -169,6 +193,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel
 	 * @generated
@@ -183,6 +208,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -192,11 +218,13 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -211,6 +239,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Architecture
 	 * @generated
@@ -220,11 +249,13 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity <em>Business Opportunity</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity <em>Business Opportunity</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.BusinessOpportunity
 	 * @generated
@@ -239,6 +270,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Concept
 	 * @generated
@@ -252,6 +284,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -265,6 +298,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Mission
 	 * @generated
@@ -279,6 +313,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProblemStatement
 	 * @generated
@@ -293,6 +328,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.ProductPositioning
 	 * @generated
@@ -307,6 +343,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.Stakeholder
 	 * @generated
@@ -321,6 +358,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.StakeholderNeed
 	 * @generated
@@ -330,11 +368,13 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -349,6 +389,7 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.annex.needs.VehicleSystem
 	 * @generated
@@ -362,15 +403,16 @@ public class NeedsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceFactoryImpl.java
index c7d4de799a2..5c79409d163 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.util.NeedsResourceImpl
  * @generated
  */
 public class NeedsResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class NeedsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceImpl.java
index 10218f2f769..ab5039c3a0f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.util.NeedsResourceFactoryImpl
  * @generated
  */
 public class NeedsResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public NeedsResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsSwitch.java
index 8f6bb66ed6c..7c679a5cacf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.annex.needs.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.annex.needs.*;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalDescription;
 import org.eclipse.papyrus.eastadl.annex.needs.ArchitecturalModel;
 import org.eclipse.papyrus.eastadl.annex.needs.Architecture;
@@ -38,21 +39,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage
  * @generated
  */
 public class NeedsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static NeedsPackage modelPackage;
@@ -61,10 +64,11 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = NeedsPackage.eINSTANCE;
 		}
 	}
@@ -73,6 +77,7 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -88,7 +93,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Architectural Description</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -103,7 +110,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Architectural Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -118,7 +127,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -133,7 +144,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -148,7 +161,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Architecture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -163,7 +178,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Business Opportunity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -178,7 +195,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Concept</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -193,7 +212,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Mission</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -208,7 +229,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Problem Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -223,7 +246,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Product Positioning</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -238,7 +263,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Stakeholder</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -253,7 +280,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Stakeholder Need</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -268,7 +297,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -283,7 +314,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Vehicle System</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -298,7 +331,9 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -312,105 +347,155 @@ public class NeedsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NeedsPackage.STAKEHOLDER: {
-				Stakeholder stakeholder = (Stakeholder)theEObject;
-				T result = caseStakeholder(stakeholder);
-				if (result == null) result = caseTraceableSpecification(stakeholder);
-				if (result == null) result = caseEAPackageableElement(stakeholder);
-				if (result == null) result = caseEAElement(stakeholder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.STAKEHOLDER_NEED: {
-				StakeholderNeed stakeholderNeed = (StakeholderNeed)theEObject;
-				T result = caseStakeholderNeed(stakeholderNeed);
-				if (result == null) result = caseTraceableSpecification(stakeholderNeed);
-				if (result == null) result = caseEAPackageableElement(stakeholderNeed);
-				if (result == null) result = caseEAElement(stakeholderNeed);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.PROBLEM_STATEMENT: {
-				ProblemStatement problemStatement = (ProblemStatement)theEObject;
-				T result = caseProblemStatement(problemStatement);
-				if (result == null) result = caseTraceableSpecification(problemStatement);
-				if (result == null) result = caseEAPackageableElement(problemStatement);
-				if (result == null) result = caseEAElement(problemStatement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.PRODUCT_POSITIONING: {
-				ProductPositioning productPositioning = (ProductPositioning)theEObject;
-				T result = caseProductPositioning(productPositioning);
-				if (result == null) result = caseTraceableSpecification(productPositioning);
-				if (result == null) result = caseEAPackageableElement(productPositioning);
-				if (result == null) result = caseEAElement(productPositioning);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.BUSINESS_OPPORTUNITY: {
-				BusinessOpportunity businessOpportunity = (BusinessOpportunity)theEObject;
-				T result = caseBusinessOpportunity(businessOpportunity);
-				if (result == null) result = caseTraceableSpecification(businessOpportunity);
-				if (result == null) result = caseEAPackageableElement(businessOpportunity);
-				if (result == null) result = caseEAElement(businessOpportunity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.CONCEPT: {
-				Concept concept = (Concept)theEObject;
-				T result = caseConcept(concept);
-				if (result == null) result = caseEAElement(concept);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.MISSION: {
-				Mission mission = (Mission)theEObject;
-				T result = caseMission(mission);
-				if (result == null) result = caseConcept(mission);
-				if (result == null) result = caseEAElement(mission);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.VEHICLE_SYSTEM: {
-				VehicleSystem vehicleSystem = (VehicleSystem)theEObject;
-				T result = caseVehicleSystem(vehicleSystem);
-				if (result == null) result = caseConcept(vehicleSystem);
-				if (result == null) result = caseEAElement(vehicleSystem);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.ARCHITECTURE: {
-				Architecture architecture = (Architecture)theEObject;
-				T result = caseArchitecture(architecture);
-				if (result == null) result = caseConcept(architecture);
-				if (result == null) result = caseEAElement(architecture);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.ARCHITECTURAL_DESCRIPTION: {
-				ArchitecturalDescription architecturalDescription = (ArchitecturalDescription)theEObject;
-				T result = caseArchitecturalDescription(architecturalDescription);
-				if (result == null) result = caseConcept(architecturalDescription);
-				if (result == null) result = caseEAElement(architecturalDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NeedsPackage.ARCHITECTURAL_MODEL: {
-				ArchitecturalModel architecturalModel = (ArchitecturalModel)theEObject;
-				T result = caseArchitecturalModel(architecturalModel);
-				if (result == null) result = caseConcept(architecturalModel);
-				if (result == null) result = caseEAElement(architecturalModel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case NeedsPackage.STAKEHOLDER:
+		{
+			Stakeholder stakeholder = (Stakeholder)theEObject;
+			T result = caseStakeholder(stakeholder);
+			if(result == null)
+				result = caseTraceableSpecification(stakeholder);
+			if(result == null)
+				result = caseEAPackageableElement(stakeholder);
+			if(result == null)
+				result = caseEAElement(stakeholder);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.STAKEHOLDER_NEED:
+		{
+			StakeholderNeed stakeholderNeed = (StakeholderNeed)theEObject;
+			T result = caseStakeholderNeed(stakeholderNeed);
+			if(result == null)
+				result = caseTraceableSpecification(stakeholderNeed);
+			if(result == null)
+				result = caseEAPackageableElement(stakeholderNeed);
+			if(result == null)
+				result = caseEAElement(stakeholderNeed);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.PROBLEM_STATEMENT:
+		{
+			ProblemStatement problemStatement = (ProblemStatement)theEObject;
+			T result = caseProblemStatement(problemStatement);
+			if(result == null)
+				result = caseTraceableSpecification(problemStatement);
+			if(result == null)
+				result = caseEAPackageableElement(problemStatement);
+			if(result == null)
+				result = caseEAElement(problemStatement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.PRODUCT_POSITIONING:
+		{
+			ProductPositioning productPositioning = (ProductPositioning)theEObject;
+			T result = caseProductPositioning(productPositioning);
+			if(result == null)
+				result = caseTraceableSpecification(productPositioning);
+			if(result == null)
+				result = caseEAPackageableElement(productPositioning);
+			if(result == null)
+				result = caseEAElement(productPositioning);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.BUSINESS_OPPORTUNITY:
+		{
+			BusinessOpportunity businessOpportunity = (BusinessOpportunity)theEObject;
+			T result = caseBusinessOpportunity(businessOpportunity);
+			if(result == null)
+				result = caseTraceableSpecification(businessOpportunity);
+			if(result == null)
+				result = caseEAPackageableElement(businessOpportunity);
+			if(result == null)
+				result = caseEAElement(businessOpportunity);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.CONCEPT:
+		{
+			Concept concept = (Concept)theEObject;
+			T result = caseConcept(concept);
+			if(result == null)
+				result = caseEAElement(concept);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.MISSION:
+		{
+			Mission mission = (Mission)theEObject;
+			T result = caseMission(mission);
+			if(result == null)
+				result = caseConcept(mission);
+			if(result == null)
+				result = caseEAElement(mission);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.VEHICLE_SYSTEM:
+		{
+			VehicleSystem vehicleSystem = (VehicleSystem)theEObject;
+			T result = caseVehicleSystem(vehicleSystem);
+			if(result == null)
+				result = caseConcept(vehicleSystem);
+			if(result == null)
+				result = caseEAElement(vehicleSystem);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.ARCHITECTURE:
+		{
+			Architecture architecture = (Architecture)theEObject;
+			T result = caseArchitecture(architecture);
+			if(result == null)
+				result = caseConcept(architecture);
+			if(result == null)
+				result = caseEAElement(architecture);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.ARCHITECTURAL_DESCRIPTION:
+		{
+			ArchitecturalDescription architecturalDescription = (ArchitecturalDescription)theEObject;
+			T result = caseArchitecturalDescription(architecturalDescription);
+			if(result == null)
+				result = caseConcept(architecturalDescription);
+			if(result == null)
+				result = caseEAElement(architecturalDescription);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case NeedsPackage.ARCHITECTURAL_MODEL:
+		{
+			ArchitecturalModel architecturalModel = (ArchitecturalModel)theEObject;
+			T result = caseArchitecturalModel(architecturalModel);
+			if(result == null)
+				result = caseConcept(architecturalModel);
+			if(result == null)
+				result = caseEAElement(architecturalModel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsXMLProcessor.java
index d71323324a3..a0c2541fa0f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/annex/needs/util/NeedsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.annex.needs.NeedsPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class NeedsXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class NeedsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NeedsXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		NeedsPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the NeedsResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new NeedsResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new NeedsResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Behavior.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Behavior.java
index ecf31f2e345..a5becd74649 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Behavior.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Behavior.java
@@ -23,9 +23,11 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Behavior</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Behavior is a container of FunctionBehaviors, it enables to regroup the behaviors assigned to functions in a particular context on which TraceableSpecifications can be applied. This can take any appropriate form depending on the language implementation (for instance in a UML implementation it could be a Package).
+ * Behavior is a container of FunctionBehaviors, it enables to regroup the behaviors assigned to functions in a particular context on which
+ * TraceableSpecifications can be applied. This can take any appropriate form depending on the language implementation (for instance in a UML
+ * implementation it could be a Package).
  * 
  * The collection of functional behaviors can be done across the EAST-ADL2 abstraction levels.
  * 
@@ -34,32 +36,33 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * 
  * Extension: BehavioredClassifier
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBehavior <em>Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getFunctionTrigger <em>Function Trigger</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getModeGroup <em>Mode Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBehavior <em>Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getFunctionTrigger <em>Function Trigger</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getModeGroup <em>Mode Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior()
  * @model
  * @generated
  */
 public interface Behavior extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Behavior</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Behavior</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Behavior</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Behavior</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior_Behavior()
 	 * @model ordered="false"
@@ -72,10 +75,10 @@ public interface Behavior extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Trigger</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Trigger</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Trigger</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior_FunctionTrigger()
 	 * @model ordered="false"
@@ -88,10 +91,10 @@ public interface Behavior extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.ModeGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode Group</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode Group</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior_ModeGroup()
 	 * @model ordered="false"
@@ -103,10 +106,10 @@ public interface Behavior extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior_Base_Package()
@@ -119,7 +122,9 @@ public interface Behavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -129,10 +134,10 @@ public interface Behavior extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getBehavior_Base_Class()
@@ -145,7 +150,9 @@ public interface Behavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorFactory.java
index fac1b80d2ca..90a4e26fd20 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface BehaviorFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	BehaviorFactory eINSTANCE = org.eclipse.papyrus.eastadl.behavior.impl.BehaviorFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface BehaviorFactory extends EFactory {
 	 * Returns a new object of class '<em>Behavior</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Behavior</em>'.

 	 * @generated

 	 */

@@ -45,6 +48,7 @@ public interface BehaviorFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Behavior</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Behavior</em>'.

 	 * @generated

 	 */

@@ -54,6 +58,7 @@ public interface BehaviorFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Trigger</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Trigger</em>'.

 	 * @generated

 	 */

@@ -63,6 +68,7 @@ public interface BehaviorFactory extends EFactory {
 	 * Returns a new object of class '<em>Mode</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Mode</em>'.

 	 * @generated

 	 */

@@ -72,6 +78,7 @@ public interface BehaviorFactory extends EFactory {
 	 * Returns a new object of class '<em>Mode Group</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Mode Group</em>'.

 	 * @generated

 	 */

@@ -80,6 +87,7 @@ public interface BehaviorFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorPackage.java
index c2b15097acb..f25c2ce5ed5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/BehaviorPackage.java
@@ -71,6 +71,7 @@ public interface BehaviorPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

@@ -79,6 +80,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl <em>Function Behavior</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionBehavior()

 		 * @generated

@@ -89,6 +91,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_BEHAVIOR__BASE_BEHAVIOR = eINSTANCE.getFunctionBehavior_Base_Behavior();

@@ -97,6 +100,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Path</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_BEHAVIOR__PATH = eINSTANCE.getFunctionBehavior_Path();

@@ -105,6 +109,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Representation</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_BEHAVIOR__REPRESENTATION = eINSTANCE.getFunctionBehavior_Representation();

@@ -113,6 +118,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_BEHAVIOR__FUNCTION = eINSTANCE.getFunctionBehavior_Function();

@@ -121,6 +127,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_BEHAVIOR__MODE = eINSTANCE.getFunctionBehavior_Mode();

@@ -129,6 +136,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl <em>Behavior</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getBehavior()

 		 * @generated

@@ -139,6 +147,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Behavior</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference BEHAVIOR__BEHAVIOR = eINSTANCE.getBehavior_Behavior();

@@ -147,6 +156,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Trigger</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference BEHAVIOR__FUNCTION_TRIGGER = eINSTANCE.getBehavior_FunctionTrigger();

@@ -155,6 +165,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode Group</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference BEHAVIOR__MODE_GROUP = eINSTANCE.getBehavior_ModeGroup();

@@ -163,6 +174,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference BEHAVIOR__BASE_PACKAGE = eINSTANCE.getBehavior_Base_Package();

@@ -171,6 +183,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference BEHAVIOR__BASE_CLASS = eINSTANCE.getBehavior_Base_Class();

@@ -179,6 +192,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl <em>Function Trigger</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionTrigger()

 		 * @generated

@@ -189,6 +203,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Trigger Condition</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_TRIGGER__TRIGGER_CONDITION = eINSTANCE.getFunctionTrigger_TriggerCondition();

@@ -197,6 +212,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TRIGGER__BASE_CLASS = eINSTANCE.getFunctionTrigger_Base_Class();

@@ -205,6 +221,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Trigger Policy</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_TRIGGER__TRIGGER_POLICY = eINSTANCE.getFunctionTrigger_TriggerPolicy();

@@ -213,6 +230,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TRIGGER__MODE = eINSTANCE.getFunctionTrigger_Mode();

@@ -221,6 +239,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TRIGGER__FUNCTION = eINSTANCE.getFunctionTrigger_Function();

@@ -229,6 +248,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TRIGGER__PORT = eINSTANCE.getFunctionTrigger_Port();

@@ -237,6 +257,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Prototype</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TRIGGER__FUNCTION_PROTOTYPE = eINSTANCE.getFunctionTrigger_FunctionPrototype();

@@ -245,6 +266,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl <em>Mode Group</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getModeGroup()

 		 * @generated

@@ -255,6 +277,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Precondition</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute MODE_GROUP__PRECONDITION = eINSTANCE.getModeGroup_Precondition();

@@ -263,6 +286,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference MODE_GROUP__MODE = eINSTANCE.getModeGroup_Mode();

@@ -271,6 +295,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference MODE_GROUP__BASE_CLASS = eINSTANCE.getModeGroup_Base_Class();

@@ -279,6 +304,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl <em>Mode</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getMode()

 		 * @generated

@@ -289,6 +315,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Condition</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute MODE__CONDITION = eINSTANCE.getMode_Condition();

@@ -297,6 +324,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference MODE__BASE_CLASS = eINSTANCE.getMode_Base_Class();

@@ -305,6 +333,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind <em>Function Behavior Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionBehaviorKind()

 		 * @generated

@@ -315,6 +344,7 @@ public interface BehaviorPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind <em>Trigger Policy Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind

 		 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getTriggerPolicyKind()

 		 * @generated

@@ -326,6 +356,7 @@ public interface BehaviorPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "behavior";

@@ -333,6 +364,7 @@ public interface BehaviorPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Behavior/1";

@@ -340,6 +372,7 @@ public interface BehaviorPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "Behavior";

@@ -347,6 +380,7 @@ public interface BehaviorPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	BehaviorPackage eINSTANCE = org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl.init();

@@ -355,6 +389,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl <em>Function Behavior</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionBehavior()

 	 * @generated

@@ -365,6 +400,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl <em>Behavior</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getBehavior()

 	 * @generated

@@ -375,6 +411,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl <em>Function Trigger</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionTrigger()

 	 * @generated

@@ -385,6 +422,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl <em>Mode Group</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getModeGroup()

 	 * @generated

@@ -395,6 +433,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl <em>Mode</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getMode()

 	 * @generated

@@ -405,6 +444,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -414,6 +454,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -423,6 +464,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -432,6 +474,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -441,6 +484,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -450,6 +494,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Behavior</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -459,6 +504,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Path</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -468,6 +514,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Representation</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -477,6 +524,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -486,6 +534,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Function</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -495,6 +544,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Behavior</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -504,6 +554,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -513,6 +564,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -522,6 +574,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -531,6 +584,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Condition</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -540,6 +594,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -549,6 +604,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The number of structural features of the '<em>Mode</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -558,6 +614,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -567,6 +624,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -576,6 +634,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -585,6 +644,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -594,6 +654,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -603,6 +664,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Behavior</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -612,6 +674,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Trigger</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -621,6 +684,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -630,6 +694,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -639,6 +704,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -648,6 +714,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The number of structural features of the '<em>Behavior</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -657,6 +724,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -666,6 +734,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -675,6 +744,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -684,6 +754,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Trigger Condition</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -693,6 +764,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -702,6 +774,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Trigger Policy</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -711,6 +784,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -720,6 +794,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Function</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -729,6 +804,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -738,6 +814,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Prototype</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -747,6 +824,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Trigger</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -756,6 +834,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -765,6 +844,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -774,6 +854,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -783,6 +864,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -792,6 +874,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -801,6 +884,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Precondition</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -810,6 +894,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -819,6 +904,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -828,6 +914,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The number of structural features of the '<em>Mode Group</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -837,6 +924,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind <em>Function Behavior Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getFunctionBehaviorKind()

 	 * @generated

@@ -847,6 +935,7 @@ public interface BehaviorPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind <em>Trigger Policy Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind

 	 * @see org.eclipse.papyrus.eastadl.behavior.impl.BehaviorPackageImpl#getTriggerPolicyKind()

 	 * @generated

@@ -857,6 +946,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.behavior.Behavior <em>Behavior</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Behavior</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior

 	 * @generated

@@ -867,6 +957,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBehavior <em>Behavior</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Behavior</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior#getBehavior()

 	 * @see #getBehavior()

@@ -875,9 +966,11 @@ public interface BehaviorPackage extends EPackage {
 	EReference getBehavior_Behavior();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getFunctionTrigger <em>Function Trigger</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getFunctionTrigger

+	 * <em>Function Trigger</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Function Trigger</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior#getFunctionTrigger()

 	 * @see #getBehavior()

@@ -889,6 +982,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getModeGroup <em>Mode Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Mode Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior#getModeGroup()

 	 * @see #getBehavior()

@@ -900,6 +994,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Package <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Package()

 	 * @see #getBehavior()

@@ -911,6 +1006,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior#getBase_Class()

 	 * @see #getBehavior()

@@ -922,6 +1018,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -931,6 +1028,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior <em>Function Behavior</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Behavior</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior

 	 * @generated

@@ -938,9 +1036,11 @@ public interface BehaviorPackage extends EPackage {
 	EClass getFunctionBehavior();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior <em>Base Behavior</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior

+	 * <em>Base Behavior</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Behavior</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior()

 	 * @see #getFunctionBehavior()

@@ -952,6 +1052,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getFunction <em>Function</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Function</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getFunction()

 	 * @see #getFunctionBehavior()

@@ -963,6 +1064,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getMode <em>Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Mode</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getMode()

 	 * @see #getFunctionBehavior()

@@ -974,6 +1076,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getPath <em>Path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getPath()

 	 * @see #getFunctionBehavior()

@@ -982,9 +1085,11 @@ public interface BehaviorPackage extends EPackage {
 	EAttribute getFunctionBehavior_Path();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation <em>Representation</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation

+	 * <em>Representation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Representation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation()

 	 * @see #getFunctionBehavior()

@@ -996,6 +1101,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind <em>Function Behavior Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Function Behavior Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind

 	 * @generated

@@ -1006,6 +1112,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger <em>Function Trigger</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Trigger</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger

 	 * @generated

@@ -1016,6 +1123,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunction <em>Function</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Function</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunction()

 	 * @see #getFunctionTrigger()

@@ -1024,9 +1132,11 @@ public interface BehaviorPackage extends EPackage {
 	EReference getFunctionTrigger_Function();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype <em>Function Prototype</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype

+	 * <em>Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Function Prototype</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype()

 	 * @see #getFunctionTrigger()

@@ -1038,6 +1148,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getMode <em>Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Mode</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getMode()

 	 * @see #getFunctionTrigger()

@@ -1049,6 +1160,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getPort <em>Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getPort()

 	 * @see #getFunctionTrigger()

@@ -1057,9 +1169,11 @@ public interface BehaviorPackage extends EPackage {
 	EReference getFunctionTrigger_Port();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition <em>Trigger Condition</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition

+	 * <em>Trigger Condition</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Trigger Condition</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition()

 	 * @see #getFunctionTrigger()

@@ -1071,6 +1185,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getBase_Class()

 	 * @see #getFunctionTrigger()

@@ -1079,9 +1194,11 @@ public interface BehaviorPackage extends EPackage {
 	EReference getFunctionTrigger_Base_Class();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy <em>Trigger Policy</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy

+	 * <em>Trigger Policy</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Trigger Policy</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy()

 	 * @see #getFunctionTrigger()

@@ -1093,6 +1210,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.behavior.Mode <em>Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Mode</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Mode

 	 * @generated

@@ -1103,6 +1221,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.Mode#getCondition <em>Condition</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Condition</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Mode#getCondition()

 	 * @see #getMode()

@@ -1114,6 +1233,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.Mode#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Mode#getBase_Class()

 	 * @see #getMode()

@@ -1125,6 +1245,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup <em>Mode Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Mode Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.ModeGroup

 	 * @generated

@@ -1135,6 +1256,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getMode <em>Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Mode</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.ModeGroup#getMode()

 	 * @see #getModeGroup()

@@ -1146,6 +1268,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.ModeGroup#getBase_Class()

 	 * @see #getModeGroup()

@@ -1157,6 +1280,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getPrecondition <em>Precondition</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Precondition</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.ModeGroup#getPrecondition()

 	 * @see #getModeGroup()

@@ -1168,6 +1292,7 @@ public interface BehaviorPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind <em>Trigger Policy Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Trigger Policy Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind

 	 * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehavior.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehavior.java
index f01c1b63988..3bef39064b9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehavior.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehavior.java
@@ -25,64 +25,84 @@ import org.eclipse.uml2.uml.Behavior;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Behavior</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * FunctionBehavior represents the behavior of a particular FunctionType - referred to by the association to FunctionType. What is meant by behavior is a transfer function performing some data computation (in case of FlowPort interaction) or an operation that can be called by another function (in case of ClientServer interaction). The representation property indicates the kind of representation used to describe the behavior (see FunctionBehaviorKind). The representation itself (e.g defined in an external model file) is identified by a URL String in the path property. If the representation is provided in the same model file as the system itself, the path property is not used. It is merely a placeholder with the purpose of containing information about and links to the external behavioral model.
+ * FunctionBehavior represents the behavior of a particular FunctionType - referred to by the association to FunctionType. What is meant by behavior
+ * is a transfer function performing some data computation (in case of FlowPort interaction) or an operation that can be called by another function
+ * (in case of ClientServer interaction). The representation property indicates the kind of representation used to describe the behavior (see
+ * FunctionBehaviorKind). The representation itself (e.g defined in an external model file) is identified by a URL String in the path property. If the
+ * representation is provided in the same model file as the system itself, the path property is not used. It is merely a placeholder with the purpose
+ * of containing information about and links to the external behavioral model.
  * 
- * FunctionBehavior may refer to execution modes - by the association to the element Mode. This is not mandatory, however when provided, the relation indicates the list of execution Modes in which the FunctionBehavior can potentially be executed (see element Mode).
+ * FunctionBehavior may refer to execution modes - by the association to the element Mode. This is not mandatory, however when provided, the relation
+ * indicates the list of execution Modes in which the FunctionBehavior can potentially be executed (see element Mode).
  * 
  * The triggering of a FunctionBehavior is unknown to the behavior. It is defined by FunctionTriggers (see this element).
  * 
- * Note that the association between FunctionBehavior and FunctionType is specified as a one-way navigable link from FunctionBehavior to FunctionType: what this means is that the EAST-ADL2 language specification does not require that a FunctionType be aware of the FunctionBehavior it is assigned to. Only the navigation from behavior to function is mandatory, the implementation of a reverse link might however be provided depending on the tool support.
+ * Note that the association between FunctionBehavior and FunctionType is specified as a one-way navigable link from FunctionBehavior to FunctionType:
+ * what this means is that the EAST-ADL2 language specification does not require that a FunctionType be aware of the FunctionBehavior it is assigned
+ * to. Only the navigation from behavior to function is mandatory, the implementation of a reverse link might however be provided depending on the
+ * tool support.
  * 
- * Although each FunctionBehavior can refer to at most one FunctionType, note that several FunctionBehaviors can be referring to the same FunctionType. In this case when a FunctionType has several behaviors, only one behavior shall be active at any given time instant, i.e. no concurrent behaviors are allowed in EAST-ADL2 functions. For instance we cannot have one active behavior in Simulink and one in Modelica. Both can be referenced in the same function but at any given time, only one is executable. Conditions such as modes, etc. must prevent two behaviors being potentially active.
+ * Although each FunctionBehavior can refer to at most one FunctionType, note that several FunctionBehaviors can be referring to the same
+ * FunctionType. In this case when a FunctionType has several behaviors, only one behavior shall be active at any given time instant, i.e. no
+ * concurrent behaviors are allowed in EAST-ADL2 functions. For instance we cannot have one active behavior in Simulink and one in Modelica. Both can
+ * be referenced in the same function but at any given time, only one is executable. Conditions such as modes, etc. must prevent two behaviors being
+ * potentially active.
  * 
- * Note also that FunctionBehaviors are assigned to FunctionTypes and not to FunctionPrototypes. This means that among a set of FunctionPrototypes, which share the same type, behaviors are also shared. However when a FunctionBehavior refer to Modes, which are referred to by different FunctionTriggers, different triggering conditions can be provided among a set of FunctionPrototypes for the same set of behaviors - see FunctionTrigger.
+ * Note also that FunctionBehaviors are assigned to FunctionTypes and not to FunctionPrototypes. This means that among a set of FunctionPrototypes,
+ * which share the same type, behaviors are also shared. However when a FunctionBehavior refer to Modes, which are referred to by different
+ * FunctionTriggers, different triggering conditions can be provided among a set of FunctionPrototypes for the same set of behaviors - see
+ * FunctionTrigger.
  * 
- * In the case where the identified FunctionType is decomposed in parts, the behavior is a specification for the composed behavior of the FunctionType. 
+ * In the case where the identified FunctionType is decomposed in parts, the behavior is a specification for the composed behavior of the
+ * FunctionType.
  * 
  * 
  * Semantics:
- * Though the representation provided to a FunctionBehavior follows the semantics of the behavioral representation used (for instance SIMULINK, ASCET, etc.). Externally, in relation to the EAST-ADL2 model, however, the FunctionBehavior has synchronous execution semantics:
+ * Though the representation provided to a FunctionBehavior follows the semantics of the behavioral representation used (for instance SIMULINK, ASCET,
+ * etc.). Externally, in relation to the EAST-ADL2 model, however, the FunctionBehavior has synchronous execution semantics:
  * 1. Read inputs from input ports
  * 2. Execute Behavior with fixed inputs (run to completion)
  * 3. Provide outputs to output ports
  * 
- * The data transfer between the EAST-ADL2 ports and the FunctionBehavior is representation specific and considered part of the execution of the FunctionBehavior.
+ * The data transfer between the EAST-ADL2 ports and the FunctionBehavior is representation specific and considered part of the execution of the
+ * FunctionBehavior.
  * 
  * 
  * 
  * Notation:
- * FunctionBehavior appears, if shown in a diagram, as a solid-outline rectangle with "Behavior" at the top right. The rectangle contains the name. 
+ * FunctionBehavior appears, if shown in a diagram, as a solid-outline rectangle with "Behavior" at the top right. The rectangle contains the name.
  * 
  * 
  * Extension: Behavior
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior <em>Base Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation <em>Representation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior <em>Base Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getPath <em>Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation <em>Representation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getFunction <em>Function</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehavior()
  * @model
  * @generated
  */
 public interface FunctionBehavior extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Behavior</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Behavior</em>' reference.
 	 * @see #setBase_Behavior(Behavior)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehavior_Base_Behavior()
@@ -95,7 +115,9 @@ public interface FunctionBehavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getBase_Behavior <em>Base Behavior</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Behavior</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Behavior</em>' reference.
 	 * @see #getBase_Behavior()
 	 * @generated
 	 */
@@ -105,10 +127,10 @@ public interface FunctionBehavior extends Context {
 	 * Returns the value of the '<em><b>Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function</em>' reference.
 	 * @see #setFunction(FunctionType)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehavior_Function()
@@ -122,10 +144,10 @@ public interface FunctionBehavior extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehavior_Mode()
 	 * @model ordered="false"
@@ -140,6 +162,7 @@ public interface FunctionBehavior extends Context {
 	 * <!-- begin-model-doc -->
 	 * The path to the file or model entity containing the ExternalBehavior
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Path</em>' attribute.
 	 * @see #setPath(String)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehavior_Path()
@@ -156,6 +179,7 @@ public interface FunctionBehavior extends Context {
 	 * <!-- begin-model-doc -->
 	 * The type of behavior that the ExternalBehavior represents.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Representation</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind
 	 * @see #setRepresentation(FunctionBehaviorKind)
@@ -169,7 +193,9 @@ public interface FunctionBehavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getFunction <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Function</em>' reference.
 	 * @see #getFunction()
 	 * @generated
 	 */
@@ -179,7 +205,9 @@ public interface FunctionBehavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getPath <em>Path</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Path</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Path</em>' attribute.
 	 * @see #getPath()
 	 * @generated
 	 */
@@ -189,7 +217,9 @@ public interface FunctionBehavior extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionBehavior#getRepresentation <em>Representation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Representation</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Representation</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehaviorKind
 	 * @see #getRepresentation()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehaviorKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehaviorKind.java
index 8462fde351d..9a45abdea55 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehaviorKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionBehaviorKind.java
@@ -27,16 +27,19 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * FunctionBehaviorKind is an enumeration which lists the various representations, used to describe a FunctionBehavior. It is used as a property of a FunctionBehavior. Several representations are listed; however one can always extend this list by using the literal OTHER. 
+ * FunctionBehaviorKind is an enumeration which lists the various representations, used to describe a FunctionBehavior. It is used as a property of a
+ * FunctionBehavior. Several representations are listed; however one can always extend this list by using the literal OTHER.
  * 
  * Semantics:
  * Distinction between UML and MARTE comes from the slight differences in the behavioral definitions (namely concerning data-flow oriented behaviors).
  * 
- * It shall be noted that though one can use several languages to provide a representation of a FunctionBehavior, the semantics shall remain compliant with the overall EAST-ADL2 execution semantics.
+ * It shall be noted that though one can use several languages to provide a representation of a FunctionBehavior, the semantics shall remain compliant
+ * with the overall EAST-ADL2 execution semantics.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionBehaviorKind()
  * @model
  * @generated
@@ -46,6 +49,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>ASCET</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASCET_VALUE
 	 * @generated
 	 * @ordered
@@ -56,6 +60,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>OTHER</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER_VALUE
 	 * @generated
 	 * @ordered
@@ -66,6 +71,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SCADE</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SCADE_VALUE
 	 * @generated
 	 * @ordered
@@ -76,6 +82,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SDL</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SDL_VALUE
 	 * @generated
 	 * @ordered
@@ -86,6 +93,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SIMULINK</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SIMULINK_VALUE
 	 * @generated
 	 * @ordered
@@ -96,6 +104,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>STATEMATE</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #STATEMATE_VALUE
 	 * @generated
 	 * @ordered
@@ -104,6 +113,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>MARTE</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MARTE_VALUE
 	 * @generated
 	 * @ordered
@@ -112,6 +122,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>UML</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #UML_VALUE
 	 * @generated
 	 * @ordered
@@ -122,10 +133,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>ASCET</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>ASCET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>ASCET</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASCET
 	 * @model
 	 * @generated
@@ -137,10 +148,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>OTHER</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER
 	 * @model
 	 * @generated
@@ -152,10 +163,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SCADE</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SCADE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SCADE</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SCADE
 	 * @model
 	 * @generated
@@ -167,10 +178,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SDL</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SDL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SDL</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SDL
 	 * @model
 	 * @generated
@@ -182,10 +193,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>SIMULINK</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SIMULINK</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SIMULINK</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SIMULINK
 	 * @model
 	 * @generated
@@ -197,10 +208,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>STATEMATE</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>STATEMATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>STATEMATE</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #STATEMATE
 	 * @model
 	 * @generated
@@ -212,10 +223,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>MARTE</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>MARTE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>MARTE</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MARTE
 	 * @model
 	 * @generated
@@ -227,10 +238,10 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * The '<em><b>UML</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>UML</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>UML</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #UML
 	 * @model
 	 * @generated
@@ -242,24 +253,16 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * An array of all the '<em><b>Function Behavior Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final FunctionBehaviorKind[] VALUES_ARRAY =
-		new FunctionBehaviorKind[] {
-			ASCET,
-			OTHER,
-			SCADE,
-			SDL,
-			SIMULINK,
-			STATEMATE,
-			MARTE,
-			UML,
-		};
+	private static final FunctionBehaviorKind[] VALUES_ARRAY = new FunctionBehaviorKind[]{ ASCET, OTHER, SCADE, SDL, SIMULINK, STATEMATE, MARTE, UML, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Function Behavior Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<FunctionBehaviorKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -268,18 +271,27 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Function Behavior Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FunctionBehaviorKind get(int value) {
-		switch (value) {
-			case ASCET_VALUE: return ASCET;
-			case OTHER_VALUE: return OTHER;
-			case SCADE_VALUE: return SCADE;
-			case SDL_VALUE: return SDL;
-			case SIMULINK_VALUE: return SIMULINK;
-			case STATEMATE_VALUE: return STATEMATE;
-			case MARTE_VALUE: return MARTE;
-			case UML_VALUE: return UML;
+		switch(value) {
+		case ASCET_VALUE:
+			return ASCET;
+		case OTHER_VALUE:
+			return OTHER;
+		case SCADE_VALUE:
+			return SCADE;
+		case SDL_VALUE:
+			return SDL;
+		case SIMULINK_VALUE:
+			return SIMULINK;
+		case STATEMATE_VALUE:
+			return STATEMATE;
+		case MARTE_VALUE:
+			return MARTE;
+		case UML_VALUE:
+			return UML;
 		}
 		return null;
 	}
@@ -288,12 +300,13 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Function Behavior Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FunctionBehaviorKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FunctionBehaviorKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -304,12 +317,13 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Function Behavior Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FunctionBehaviorKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FunctionBehaviorKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -319,6 +333,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -326,6 +341,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -333,6 +349,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -341,6 +358,7 @@ public enum FunctionBehaviorKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private FunctionBehaviorKind(int value, String name, String literal) {
@@ -352,39 +370,43 @@ public enum FunctionBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //FunctionBehaviorKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionTrigger.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionTrigger.java
index fb4cf541602..4df859a0552 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionTrigger.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/FunctionTrigger.java
@@ -26,21 +26,32 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Trigger</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * FunctionTrigger represents the triggering parameters necessary to define the execution of an identified FunctionType or FunctionPrototype. When referring to a FunctionType, a FunctionTrigger applies to all FunctionPrototypes of the given type. When referring to a FunctionPrototype, the trigger is only valid for this particular FunctionPrototype.
+ * FunctionTrigger represents the triggering parameters necessary to define the execution of an identified FunctionType or FunctionPrototype. When
+ * referring to a FunctionType, a FunctionTrigger applies to all FunctionPrototypes of the given type. When referring to a FunctionPrototype, the
+ * trigger is only valid for this particular FunctionPrototype.
  * 
- * Triggering is defined either as event-driven or time-driven - depending on the property triggerPolicy. If set to TIME, the timing constraint is defined with an event constraint associated with the Function’s or FunctionPrototype’s EventFunction. The function event refers to the activation of the function. If set to EVENT, one or several ports of the Function triggers the function, i.e. activates the function. In both cases, a triggerCondition is provided in the form of a Boolean expression that must evaluate to true for the function to execute. The triggerCondition syntax and grammar is unspecified.
+ * Triggering is defined either as event-driven or time-driven - depending on the property triggerPolicy. If set to TIME, the timing constraint is
+ * defined with an event constraint associated with the Function’s or FunctionPrototype’s EventFunction. The function event refers to the activation
+ * of the function. If set to EVENT, one or several ports of the Function triggers the function, i.e. activates the function. In both cases, a
+ * triggerCondition is provided in the form of a Boolean expression that must evaluate to true for the function to execute. The triggerCondition
+ * syntax and grammar is unspecified.
  * 
- * In addition a FunctionTrigger may refer to a list of Modes in which the trigger will be considered as potentially active. Because of FunctionBehaviors may also refer to Modes, it is thus possible to arrange various function configurations for which different sets of triggers and behaviors are active. And this, at various level of granularity, either with a type-wise scope (by referring to a FunctionType) or specifically at prototype level (by referring to a FunctionPrototype).
+ * In addition a FunctionTrigger may refer to a list of Modes in which the trigger will be considered as potentially active. Because of
+ * FunctionBehaviors may also refer to Modes, it is thus possible to arrange various function configurations for which different sets of triggers and
+ * behaviors are active. And this, at various level of granularity, either with a type-wise scope (by referring to a FunctionType) or specifically at
+ * prototype level (by referring to a FunctionPrototype).
  * 
- * Note that several FunctionTriggers may be assigned to the same Function (Type or Prototype), for instance to define alternative trigger conditions and/or timing constraints.
+ * Note that several FunctionTriggers may be assigned to the same Function (Type or Prototype), for instance to define alternative trigger conditions
+ * and/or timing constraints.
  * 
  * 
  * Semantics:
  * Association Mode defines in which modes the trigger is active
  * 
- * It is possible to have multiple triggers on a function, e.g. a slow period complemented with an event trigger allows fast response when needed but a minimal execution rate.
+ * It is possible to have multiple triggers on a function, e.g. a slow period complemented with an event trigger allows fast response when needed but
+ * a minimal execution rate.
  * 
  * 
  * Constraints:
@@ -48,40 +59,42 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType;
  * 
  * [2] The port association is empty when triggerPolicy is TIME.
  * 
- * [3] Function and functionPrototype are mutually exclusive associations. A FunctionTrigger either identifies a FunctionType or a FunctionPrototype as its target function, but not both.
+ * [3] Function and functionPrototype are mutually exclusive associations. A FunctionTrigger either identifies a FunctionType or a FunctionPrototype
+ * as its target function, but not both.
  * 
  * [4] Only FunctionFlowPort of FlowDirection=in shall be referred to in the association port and at least one of them shall trigger the function
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition <em>Trigger Condition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy <em>Trigger Policy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunction <em>Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype <em>Function Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition <em>Trigger Condition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy <em>Trigger Policy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype <em>Function Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger()
  * @model
  * @generated
  */
 public interface FunctionTrigger extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function</em>' reference.
 	 * @see #setFunction(FunctionType)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_Function()
@@ -94,10 +107,10 @@ public interface FunctionTrigger extends EAElement {
 	 * Returns the value of the '<em><b>Function Prototype</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Prototype</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Prototype</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Prototype</em>' reference.
 	 * @see #setFunctionPrototype(FunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_FunctionPrototype()
@@ -111,10 +124,10 @@ public interface FunctionTrigger extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_Mode()
 	 * @model ordered="false"
@@ -127,10 +140,10 @@ public interface FunctionTrigger extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_Port()
 	 * @model ordered="false"
@@ -145,6 +158,7 @@ public interface FunctionTrigger extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * An OCL expression that allows release of the ADLFunctionType only if it evaluates to TRUE.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Trigger Condition</em>' attribute.
 	 * @see #setTriggerCondition(String)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_TriggerCondition()
@@ -161,6 +175,7 @@ public interface FunctionTrigger extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Defines whether time or trigger events on ports makes the Function execute
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Trigger Policy</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind
 	 * @see #setTriggerPolicy(TriggerPolicyKind)
@@ -174,17 +189,22 @@ public interface FunctionTrigger extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunction <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Function</em>' reference.
 	 * @see #getFunction()
 	 * @generated
 	 */
 	void setFunction(FunctionType value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype <em>Function Prototype</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getFunctionPrototype <em>Function Prototype</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Prototype</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Function Prototype</em>' reference.
 	 * @see #getFunctionPrototype()
 	 * @generated
 	 */
@@ -194,7 +214,9 @@ public interface FunctionTrigger extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerCondition <em>Trigger Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Trigger Condition</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Trigger Condition</em>' attribute.
 	 * @see #getTriggerCondition()
 	 * @generated
 	 */
@@ -204,10 +226,10 @@ public interface FunctionTrigger extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getFunctionTrigger_Base_Class()
@@ -220,7 +242,9 @@ public interface FunctionTrigger extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -230,7 +254,9 @@ public interface FunctionTrigger extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.FunctionTrigger#getTriggerPolicy <em>Trigger Policy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Trigger Policy</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Trigger Policy</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind
 	 * @see #getTriggerPolicy()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Mode.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Mode.java
index 2ea0db741ae..92ff849984c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Mode.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/Mode.java
@@ -22,41 +22,44 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mode</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Modes are a way to introduce various configurations in the system to account for different states of the system, or of a hardware entity, or an application. The use of modes can be used to filter different views of the model.
+ * Modes are a way to introduce various configurations in the system to account for different states of the system, or of a hardware entity, or an
+ * application. The use of modes can be used to filter different views of the model.
  * 
  * Modes are characterized by a Boolean condition provided as a String which evaluates to true when the Mode is active.
  * 
- * As far as behavior is concerned, Modes enable to logically organize a set of triggers and behaviors over a set of functions. Modes are both referred to by FunctionTriggers and FunctionBehaviors, thus capturing this organization (see FunctionTrigger and FunctionBehavior).
+ * As far as behavior is concerned, Modes enable to logically organize a set of triggers and behaviors over a set of functions. Modes are both
+ * referred to by FunctionTriggers and FunctionBehaviors, thus capturing this organization (see FunctionTrigger and FunctionBehavior).
  * 
  * Modes can be further organized in mutually exclusive sets with ModeGroups (see that element).
  * 
  * Semantics:
  * The Mode is active if and only if the condition is true.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Mode#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.Mode#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Mode#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.Mode#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getMode()
  * @model
  * @generated
  */
 public interface Mode extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Condition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Condition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Condition</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Condition</em>' attribute.
 	 * @see #setCondition(String)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getMode_Condition()
@@ -69,7 +72,9 @@ public interface Mode extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.Mode#getCondition <em>Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Condition</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Condition</em>' attribute.
 	 * @see #getCondition()
 	 * @generated
 	 */
@@ -79,10 +84,10 @@ public interface Mode extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getMode_Base_Class()
@@ -95,7 +100,9 @@ public interface Mode extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.Mode#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/ModeGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/ModeGroup.java
index f36978d1d84..26af3bcd578 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/ModeGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/ModeGroup.java
@@ -23,34 +23,37 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mode Group</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ModeGroups serve as container of Modes. The set of Modes in a ModeGroup are mutually exclusive. This means that only one Mode of a ModeGroup is active at any point in time. A precondition in the form of a Boolean expression is assigned to the ModeGroup so that ModeGroups can be switched on and off as a whole.
+ * ModeGroups serve as container of Modes. The set of Modes in a ModeGroup are mutually exclusive. This means that only one Mode of a ModeGroup is
+ * active at any point in time. A precondition in the form of a Boolean expression is assigned to the ModeGroup so that ModeGroups can be switched on
+ * and off as a whole.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getPrecondition <em>Precondition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getModeGroup()
  * @model
  * @generated
  */
 public interface ModeGroup extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Mode</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getModeGroup_Mode()
 	 * @model required="true" ordered="false"
@@ -62,10 +65,10 @@ public interface ModeGroup extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getModeGroup_Base_Class()
@@ -78,7 +81,9 @@ public interface ModeGroup extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -88,10 +93,10 @@ public interface ModeGroup extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Precondition</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Precondition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Precondition</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Precondition</em>' attribute.
 	 * @see #setPrecondition(String)
 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getModeGroup_Precondition()
@@ -104,7 +109,9 @@ public interface ModeGroup extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.behavior.ModeGroup#getPrecondition <em>Precondition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Precondition</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Precondition</em>' attribute.
 	 * @see #getPrecondition()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/TriggerPolicyKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/TriggerPolicyKind.java
index fd9e2247207..e75eb169951 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/TriggerPolicyKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/TriggerPolicyKind.java
@@ -30,11 +30,12 @@ import org.eclipse.emf.common.util.Enumerator;
  * TriggerPolicyKind represents an enumeration for triggering policies.
  * 
  * Semantics:
- * The TriggerPolicyKind contains EVENT and TIME as possible triggering policies. 
+ * The TriggerPolicyKind contains EVENT and TIME as possible triggering policies.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#getTriggerPolicyKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * The '<em><b>EVENT</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #EVENT_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * The '<em><b>TIME</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TIME_VALUE
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Triggering by event.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #EVENT
 	 * @model
 	 * @generated
@@ -81,6 +85,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Triggering by time.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #TIME
 	 * @model
 	 * @generated
@@ -92,18 +97,16 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * An array of all the '<em><b>Trigger Policy Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final TriggerPolicyKind[] VALUES_ARRAY =
-		new TriggerPolicyKind[] {
-			EVENT,
-			TIME,
-		};
+	private static final TriggerPolicyKind[] VALUES_ARRAY = new TriggerPolicyKind[]{ EVENT, TIME, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Trigger Policy Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<TriggerPolicyKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -112,12 +115,15 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * Returns the '<em><b>Trigger Policy Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TriggerPolicyKind get(int value) {
-		switch (value) {
-			case EVENT_VALUE: return EVENT;
-			case TIME_VALUE: return TIME;
+		switch(value) {
+		case EVENT_VALUE:
+			return EVENT;
+		case TIME_VALUE:
+			return TIME;
 		}
 		return null;
 	}
@@ -126,12 +132,13 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * Returns the '<em><b>Trigger Policy Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TriggerPolicyKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TriggerPolicyKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -142,12 +149,13 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * Returns the '<em><b>Trigger Policy Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TriggerPolicyKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TriggerPolicyKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -157,6 +165,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -164,6 +173,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -171,6 +181,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -179,6 +190,7 @@ public enum TriggerPolicyKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private TriggerPolicyKind(int value, String name, String literal) {
@@ -190,39 +202,43 @@ public enum TriggerPolicyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //TriggerPolicyKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorFactoryImpl.java
index 748e195b279..c845208d5d5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.behavior.*;

 import org.eclipse.papyrus.eastadl.behavior.Behavior;

 import org.eclipse.papyrus.eastadl.behavior.BehaviorFactory;

 import org.eclipse.papyrus.eastadl.behavior.BehaviorPackage;

@@ -34,12 +35,14 @@ import org.eclipse.papyrus.eastadl.behavior.TriggerPolicyKind;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -51,16 +54,16 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static BehaviorFactory init() {

 		try {

 			BehaviorFactory theBehaviorFactory = (BehaviorFactory)EPackage.Registry.INSTANCE.getEFactory(BehaviorPackage.eNS_URI);

-			if (theBehaviorFactory != null) {

+			if(theBehaviorFactory != null) {

 				return theBehaviorFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new BehaviorFactoryImpl();

@@ -69,6 +72,7 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorFactoryImpl() {

@@ -78,6 +82,7 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertFunctionBehaviorKindToString(EDataType eDataType, Object instanceValue) {

@@ -86,23 +91,25 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case BehaviorPackage.FUNCTION_BEHAVIOR_KIND:

-				return convertFunctionBehaviorKindToString(eDataType, instanceValue);

-			case BehaviorPackage.TRIGGER_POLICY_KIND:

-				return convertTriggerPolicyKindToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case BehaviorPackage.FUNCTION_BEHAVIOR_KIND:

+			return convertFunctionBehaviorKindToString(eDataType, instanceValue);

+		case BehaviorPackage.TRIGGER_POLICY_KIND:

+			return convertTriggerPolicyKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertTriggerPolicyKindToString(EDataType eDataType, Object instanceValue) {

@@ -111,24 +118,31 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case BehaviorPackage.FUNCTION_BEHAVIOR: return createFunctionBehavior();

-			case BehaviorPackage.MODE: return createMode();

-			case BehaviorPackage.BEHAVIOR: return createBehavior();

-			case BehaviorPackage.FUNCTION_TRIGGER: return createFunctionTrigger();

-			case BehaviorPackage.MODE_GROUP: return createModeGroup();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case BehaviorPackage.FUNCTION_BEHAVIOR:

+			return createFunctionBehavior();

+		case BehaviorPackage.MODE:

+			return createMode();

+		case BehaviorPackage.BEHAVIOR:

+			return createBehavior();

+		case BehaviorPackage.FUNCTION_TRIGGER:

+			return createFunctionTrigger();

+		case BehaviorPackage.MODE_GROUP:

+			return createModeGroup();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Behavior createBehavior() {

@@ -138,23 +152,25 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case BehaviorPackage.FUNCTION_BEHAVIOR_KIND:

-				return createFunctionBehaviorKindFromString(eDataType, initialValue);

-			case BehaviorPackage.TRIGGER_POLICY_KIND:

-				return createTriggerPolicyKindFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case BehaviorPackage.FUNCTION_BEHAVIOR_KIND:

+			return createFunctionBehaviorKindFromString(eDataType, initialValue);

+		case BehaviorPackage.TRIGGER_POLICY_KIND:

+			return createTriggerPolicyKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionBehavior createFunctionBehavior() {

@@ -165,17 +181,20 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionBehaviorKind createFunctionBehaviorKindFromString(EDataType eDataType, String initialValue) {

 		FunctionBehaviorKind result = FunctionBehaviorKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionTrigger createFunctionTrigger() {

@@ -186,6 +205,7 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Mode createMode() {

@@ -196,6 +216,7 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ModeGroup createModeGroup() {

@@ -206,16 +227,19 @@ public class BehaviorFactoryImpl extends EFactoryImpl implements BehaviorFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public TriggerPolicyKind createTriggerPolicyKindFromString(EDataType eDataType, String initialValue) {

 		TriggerPolicyKind result = TriggerPolicyKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorPackage getBehaviorPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorImpl.java
index d586d239cf3..f272fd26c66 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorImpl.java
@@ -38,21 +38,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBehavior <em>Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getFunctionTrigger <em>Function Trigger</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getModeGroup <em>Mode Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBehavior <em>Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getFunctionTrigger <em>Function Trigger</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getModeGroup <em>Mode Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.BehaviorImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class BehaviorImpl extends ContextImpl implements Behavior {
+
 	/**
 	 * The cached value of the '{@link #getBehavior() <em>Behavior</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBehavior()
 	 * @generated
 	 * @ordered
@@ -63,6 +65,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	 * The cached value of the '{@link #getFunctionTrigger() <em>Function Trigger</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionTrigger()
 	 * @generated
 	 * @ordered
@@ -73,6 +76,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	 * The cached value of the '{@link #getModeGroup() <em>Mode Group</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getModeGroup()
 	 * @generated
 	 * @ordered
@@ -83,6 +87,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -93,6 +98,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BehaviorImpl() {
@@ -111,23 +118,26 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BehaviorPackage.BEHAVIOR__BEHAVIOR:
-				return getBehavior();
-			case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
-				return getFunctionTrigger();
-			case BehaviorPackage.BEHAVIOR__MODE_GROUP:
-				return getModeGroup();
-			case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case BehaviorPackage.BEHAVIOR__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case BehaviorPackage.BEHAVIOR__BEHAVIOR:
+			return getBehavior();
+		case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
+			return getFunctionTrigger();
+		case BehaviorPackage.BEHAVIOR__MODE_GROUP:
+			return getModeGroup();
+		case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case BehaviorPackage.BEHAVIOR__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -135,21 +145,22 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.BEHAVIOR__BEHAVIOR:
-				return behavior != null && !behavior.isEmpty();
-			case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
-				return functionTrigger != null && !functionTrigger.isEmpty();
-			case BehaviorPackage.BEHAVIOR__MODE_GROUP:
-				return modeGroup != null && !modeGroup.isEmpty();
-			case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
-				return base_Package != null;
-			case BehaviorPackage.BEHAVIOR__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case BehaviorPackage.BEHAVIOR__BEHAVIOR:
+			return behavior != null && !behavior.isEmpty();
+		case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
+			return functionTrigger != null && !functionTrigger.isEmpty();
+		case BehaviorPackage.BEHAVIOR__MODE_GROUP:
+			return modeGroup != null && !modeGroup.isEmpty();
+		case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
+			return base_Package != null;
+		case BehaviorPackage.BEHAVIOR__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -157,30 +168,31 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BehaviorPackage.BEHAVIOR__BEHAVIOR:
-				getBehavior().clear();
-				getBehavior().addAll((Collection<? extends FunctionBehavior>)newValue);
-				return;
-			case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
-				getFunctionTrigger().clear();
-				getFunctionTrigger().addAll((Collection<? extends FunctionTrigger>)newValue);
-				return;
-			case BehaviorPackage.BEHAVIOR__MODE_GROUP:
-				getModeGroup().clear();
-				getModeGroup().addAll((Collection<? extends ModeGroup>)newValue);
-				return;
-			case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case BehaviorPackage.BEHAVIOR__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.BEHAVIOR__BEHAVIOR:
+			getBehavior().clear();
+			getBehavior().addAll((Collection<? extends FunctionBehavior>)newValue);
+			return;
+		case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
+			getFunctionTrigger().clear();
+			getFunctionTrigger().addAll((Collection<? extends FunctionTrigger>)newValue);
+			return;
+		case BehaviorPackage.BEHAVIOR__MODE_GROUP:
+			getModeGroup().clear();
+			getModeGroup().addAll((Collection<? extends ModeGroup>)newValue);
+			return;
+		case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case BehaviorPackage.BEHAVIOR__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -188,6 +200,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,26 +211,27 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.BEHAVIOR__BEHAVIOR:
-				getBehavior().clear();
-				return;
-			case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
-				getFunctionTrigger().clear();
-				return;
-			case BehaviorPackage.BEHAVIOR__MODE_GROUP:
-				getModeGroup().clear();
-				return;
-			case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case BehaviorPackage.BEHAVIOR__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.BEHAVIOR__BEHAVIOR:
+			getBehavior().clear();
+			return;
+		case BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER:
+			getFunctionTrigger().clear();
+			return;
+		case BehaviorPackage.BEHAVIOR__MODE_GROUP:
+			getModeGroup().clear();
+			return;
+		case BehaviorPackage.BEHAVIOR__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case BehaviorPackage.BEHAVIOR__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -225,10 +239,11 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionBehavior> getBehavior() {
-		if (behavior == null) {
+		if(behavior == null) {
 			behavior = new EObjectResolvingEList<FunctionBehavior>(FunctionBehavior.class, this, BehaviorPackage.BEHAVIOR__BEHAVIOR);
 		}
 		return behavior;
@@ -237,10 +252,11 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionTrigger> getFunctionTrigger() {
-		if (functionTrigger == null) {
+		if(functionTrigger == null) {
 			functionTrigger = new EObjectResolvingEList<FunctionTrigger>(FunctionTrigger.class, this, BehaviorPackage.BEHAVIOR__FUNCTION_TRIGGER);
 		}
 		return functionTrigger;
@@ -249,10 +265,11 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ModeGroup> getModeGroup() {
-		if (modeGroup == null) {
+		if(modeGroup == null) {
 			modeGroup = new EObjectResolvingEList<ModeGroup>(ModeGroup.class, this, BehaviorPackage.BEHAVIOR__MODE_GROUP);
 		}
 		return modeGroup;
@@ -261,14 +278,15 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.BEHAVIOR__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -278,6 +296,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -287,26 +306,28 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.BEHAVIOR__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.BEHAVIOR__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -316,6 +337,7 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -325,12 +347,13 @@ public class BehaviorImpl extends ContextImpl implements Behavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.BEHAVIOR__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorPackageImpl.java
index 030ed84b8d9..72defba6c4a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/BehaviorPackageImpl.java
@@ -91,12 +91,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -104,16 +106,18 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * 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 BehaviorPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link BehaviorPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static BehaviorPackage init() {

-		if (isInited) return (BehaviorPackage)EPackage.Registry.INSTANCE.getEPackage(BehaviorPackage.eNS_URI);

+		if(isInited)

+			return (BehaviorPackage)EPackage.Registry.INSTANCE.getEPackage(BehaviorPackage.eNS_URI);

 

 		// Obtain or create and register package

 		BehaviorPackageImpl theBehaviorPackage = (BehaviorPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BehaviorPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BehaviorPackageImpl());

@@ -215,7 +219,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 		// Mark meta-data to indicate it can't be changed

 		theBehaviorPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(BehaviorPackage.eNS_URI, theBehaviorPackage);

 		return theBehaviorPackage;

@@ -224,6 +228,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionBehaviorEClass = null;

@@ -231,6 +236,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass behaviorEClass = null;

@@ -238,6 +244,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionTriggerEClass = null;

@@ -245,6 +252,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass modeGroupEClass = null;

@@ -252,6 +260,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass modeEClass = null;

@@ -259,6 +268,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum functionBehaviorKindEEnum = null;

@@ -266,31 +276,33 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum triggerPolicyKindEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage#eNS_URI

 	 * @see #init()

@@ -301,13 +313,15 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -351,6 +365,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getBehavior() {

@@ -360,6 +375,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBehavior_Behavior() {

@@ -369,6 +385,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBehavior_FunctionTrigger() {

@@ -378,6 +395,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBehavior_ModeGroup() {

@@ -387,6 +405,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBehavior_Base_Package() {

@@ -396,6 +415,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBehavior_Base_Class() {

@@ -404,6 +424,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorFactory getBehaviorFactory() {

@@ -413,6 +434,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionBehavior() {

@@ -422,6 +444,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionBehavior_Base_Behavior() {

@@ -431,6 +454,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionBehavior_Function() {

@@ -440,6 +464,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionBehavior_Mode() {

@@ -449,6 +474,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionBehavior_Path() {

@@ -458,6 +484,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionBehavior_Representation() {

@@ -467,6 +494,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getFunctionBehaviorKind() {

@@ -476,6 +504,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionTrigger() {

@@ -485,6 +514,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionTrigger_Function() {

@@ -494,6 +524,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionTrigger_FunctionPrototype() {

@@ -503,6 +534,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionTrigger_Mode() {

@@ -512,6 +544,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionTrigger_Port() {

@@ -521,6 +554,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionTrigger_TriggerCondition() {

@@ -530,6 +564,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionTrigger_Base_Class() {

@@ -539,6 +574,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionTrigger_TriggerPolicy() {

@@ -548,6 +584,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getMode() {

@@ -557,6 +594,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getMode_Condition() {

@@ -566,6 +604,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getMode_Base_Class() {

@@ -575,6 +614,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getModeGroup() {

@@ -584,6 +624,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getModeGroup_Mode() {

@@ -593,6 +634,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getModeGroup_Base_Class() {

@@ -602,6 +644,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getModeGroup_Precondition() {

@@ -611,6 +654,7 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getTriggerPolicyKind() {

@@ -618,13 +662,15 @@ public class BehaviorPackageImpl extends EPackageImpl implements BehaviorPackage
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionBehaviorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionBehaviorImpl.java
index 5a879bcacfd..e9663f3159f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionBehaviorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionBehaviorImpl.java
@@ -39,21 +39,23 @@ import org.eclipse.uml2.uml.Behavior;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getBase_Behavior <em>Base Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getRepresentation <em>Representation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getBase_Behavior <em>Base Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getPath <em>Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getRepresentation <em>Representation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionBehaviorImpl#getFunction <em>Function</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavior {
+
 	/**
 	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Behavior()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPath()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPath()
 	 * @generated
 	 * @ordered
@@ -84,6 +88,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The default value of the '{@link #getRepresentation() <em>Representation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepresentation()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The cached value of the '{@link #getRepresentation() <em>Representation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepresentation()
 	 * @generated
 	 * @ordered
@@ -104,6 +110,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The cached value of the '{@link #getMode() <em>Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -114,6 +121,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	 * The cached value of the '{@link #getFunction() <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunction()
 	 * @generated
 	 * @ordered
@@ -123,6 +131,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionBehaviorImpl() {
@@ -132,6 +141,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType basicGetFunction() {
@@ -141,23 +151,26 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
-				if (resolve) return getBase_Behavior();
-				return basicGetBase_Behavior();
-			case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
-				return getPath();
-			case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
-				return getRepresentation();
-			case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
-				return getMode();
-			case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
-				if (resolve) return getFunction();
-				return basicGetFunction();
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
+			if(resolve)
+				return getBase_Behavior();
+			return basicGetBase_Behavior();
+		case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
+			return getPath();
+		case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
+			return getRepresentation();
+		case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
+			return getMode();
+		case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
+			if(resolve)
+				return getFunction();
+			return basicGetFunction();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -165,21 +178,22 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
-				return base_Behavior != null;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
-				return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
-			case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
-				return representation != REPRESENTATION_EDEFAULT;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
-				return mode != null && !mode.isEmpty();
-			case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
-				return function != null;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
+			return base_Behavior != null;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
+			return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
+		case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
+			return representation != REPRESENTATION_EDEFAULT;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
+			return mode != null && !mode.isEmpty();
+		case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
+			return function != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -187,28 +201,29 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
-				setBase_Behavior((Behavior)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
-				setPath((String)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
-				setRepresentation((FunctionBehaviorKind)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
-				setFunction((FunctionType)newValue);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
+			setBase_Behavior((Behavior)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
+			setPath((String)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
+			setRepresentation((FunctionBehaviorKind)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
+			setFunction((FunctionType)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -216,6 +231,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -226,14 +242,15 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Behavior getBase_Behavior() {
-		if (base_Behavior != null && base_Behavior.eIsProxy()) {
+		if(base_Behavior != null && base_Behavior.eIsProxy()) {
 			InternalEObject oldBase_Behavior = (InternalEObject)base_Behavior;
 			base_Behavior = (Behavior)eResolveProxy(oldBase_Behavior);
-			if (base_Behavior != oldBase_Behavior) {
-				if (eNotificationRequired())
+			if(base_Behavior != oldBase_Behavior) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));
 			}
 		}
@@ -243,6 +260,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Behavior basicGetBase_Behavior() {
@@ -252,38 +270,40 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Behavior(Behavior newBase_Behavior) {
 		Behavior oldBase_Behavior = base_Behavior;
 		base_Behavior = newBase_Behavior;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
-				setBase_Behavior((Behavior)null);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
-				setPath(PATH_EDEFAULT);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
-				setRepresentation(REPRESENTATION_EDEFAULT);
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
-				getMode().clear();
-				return;
-			case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
-				setFunction((FunctionType)null);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_BEHAVIOR__BASE_BEHAVIOR:
+			setBase_Behavior((Behavior)null);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__PATH:
+			setPath(PATH_EDEFAULT);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION:
+			setRepresentation(REPRESENTATION_EDEFAULT);
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__MODE:
+			getMode().clear();
+			return;
+		case BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION:
+			setFunction((FunctionType)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -291,14 +311,15 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType getFunction() {
-		if (function != null && function.eIsProxy()) {
+		if(function != null && function.eIsProxy()) {
 			InternalEObject oldFunction = (InternalEObject)function;
 			function = (FunctionType)eResolveProxy(oldFunction);
-			if (function != oldFunction) {
-				if (eNotificationRequired())
+			if(function != oldFunction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION, oldFunction, function));
 			}
 		}
@@ -308,10 +329,11 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, BehaviorPackage.FUNCTION_BEHAVIOR__MODE);
 		}
 		return mode;
@@ -320,6 +342,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getPath() {
@@ -329,6 +352,7 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionBehaviorKind getRepresentation() {
@@ -338,47 +362,52 @@ public class FunctionBehaviorImpl extends ContextImpl implements FunctionBehavio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunction(FunctionType newFunction) {
 		FunctionType oldFunction = function;
 		function = newFunction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_BEHAVIOR__FUNCTION, oldFunction, function));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPath(String newPath) {
 		String oldPath = path;
 		path = newPath;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_BEHAVIOR__PATH, oldPath, path));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRepresentation(FunctionBehaviorKind newRepresentation) {
 		FunctionBehaviorKind oldRepresentation = representation;
 		representation = newRepresentation == null ? REPRESENTATION_EDEFAULT : newRepresentation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_BEHAVIOR__REPRESENTATION, oldRepresentation, representation));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (path: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionTriggerImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionTriggerImpl.java
index 66fefa79128..a0faa762b49 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionTriggerImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/FunctionTriggerImpl.java
@@ -40,23 +40,25 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getTriggerCondition <em>Trigger Condition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getTriggerPolicy <em>Trigger Policy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getFunction <em>Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getFunctionPrototype <em>Function Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getTriggerCondition <em>Trigger Condition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getTriggerPolicy <em>Trigger Policy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.FunctionTriggerImpl#getFunctionPrototype <em>Function Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigger {
+
 	/**
 	 * The default value of the '{@link #getTriggerCondition() <em>Trigger Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTriggerCondition()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getTriggerCondition() <em>Trigger Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTriggerCondition()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The default value of the '{@link #getTriggerPolicy() <em>Trigger Policy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTriggerPolicy()
 	 * @generated
 	 * @ordered
@@ -97,6 +102,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getTriggerPolicy() <em>Trigger Policy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTriggerPolicy()
 	 * @generated
 	 * @ordered
@@ -107,6 +113,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getMode() <em>Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -117,6 +124,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getFunction() <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunction()
 	 * @generated
 	 * @ordered
@@ -127,6 +135,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getPort() <em>Port</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort()
 	 * @generated
 	 * @ordered
@@ -137,6 +146,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	 * The cached value of the '{@link #getFunctionPrototype() <em>Function Prototype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionPrototype()
 	 * @generated
 	 * @ordered
@@ -146,6 +156,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionTriggerImpl() {
@@ -155,6 +166,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType basicGetFunction() {
@@ -164,6 +176,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype basicGetFunctionPrototype() {
@@ -173,28 +186,32 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
-				return getTriggerCondition();
-			case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
-				return getTriggerPolicy();
-			case BehaviorPackage.FUNCTION_TRIGGER__MODE:
-				return getMode();
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
-				if (resolve) return getFunction();
-				return basicGetFunction();
-			case BehaviorPackage.FUNCTION_TRIGGER__PORT:
-				return getPort();
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
-				if (resolve) return getFunctionPrototype();
-				return basicGetFunctionPrototype();
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
+			return getTriggerCondition();
+		case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
+			return getTriggerPolicy();
+		case BehaviorPackage.FUNCTION_TRIGGER__MODE:
+			return getMode();
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
+			if(resolve)
+				return getFunction();
+			return basicGetFunction();
+		case BehaviorPackage.FUNCTION_TRIGGER__PORT:
+			return getPort();
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
+			if(resolve)
+				return getFunctionPrototype();
+			return basicGetFunctionPrototype();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -202,25 +219,26 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
-				return TRIGGER_CONDITION_EDEFAULT == null ? triggerCondition != null : !TRIGGER_CONDITION_EDEFAULT.equals(triggerCondition);
-			case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
-				return base_Class != null;
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
-				return triggerPolicy != TRIGGER_POLICY_EDEFAULT;
-			case BehaviorPackage.FUNCTION_TRIGGER__MODE:
-				return mode != null && !mode.isEmpty();
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
-				return function != null;
-			case BehaviorPackage.FUNCTION_TRIGGER__PORT:
-				return port != null && !port.isEmpty();
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
-				return functionPrototype != null;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
+			return TRIGGER_CONDITION_EDEFAULT == null ? triggerCondition != null : !TRIGGER_CONDITION_EDEFAULT.equals(triggerCondition);
+		case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
+			return base_Class != null;
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
+			return triggerPolicy != TRIGGER_POLICY_EDEFAULT;
+		case BehaviorPackage.FUNCTION_TRIGGER__MODE:
+			return mode != null && !mode.isEmpty();
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
+			return function != null;
+		case BehaviorPackage.FUNCTION_TRIGGER__PORT:
+			return port != null && !port.isEmpty();
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
+			return functionPrototype != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -228,35 +246,36 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
-				setTriggerCondition((String)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
-				setTriggerPolicy((TriggerPolicyKind)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
-				setFunction((FunctionType)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__PORT:
-				getPort().clear();
-				getPort().addAll((Collection<? extends FunctionPort>)newValue);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
-				setFunctionPrototype((FunctionPrototype)newValue);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
+			setTriggerCondition((String)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
+			setTriggerPolicy((TriggerPolicyKind)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
+			setFunction((FunctionType)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__PORT:
+			getPort().clear();
+			getPort().addAll((Collection<? extends FunctionPort>)newValue);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
+			setFunctionPrototype((FunctionPrototype)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -264,6 +283,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -274,32 +294,33 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
-				setTriggerCondition(TRIGGER_CONDITION_EDEFAULT);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
-				setTriggerPolicy(TRIGGER_POLICY_EDEFAULT);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__MODE:
-				getMode().clear();
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
-				setFunction((FunctionType)null);
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__PORT:
-				getPort().clear();
-				return;
-			case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
-				setFunctionPrototype((FunctionPrototype)null);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION:
+			setTriggerCondition(TRIGGER_CONDITION_EDEFAULT);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY:
+			setTriggerPolicy(TRIGGER_POLICY_EDEFAULT);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__MODE:
+			getMode().clear();
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION:
+			setFunction((FunctionType)null);
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__PORT:
+			getPort().clear();
+			return;
+		case BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE:
+			setFunctionPrototype((FunctionPrototype)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -307,14 +328,15 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType getFunction() {
-		if (function != null && function.eIsProxy()) {
+		if(function != null && function.eIsProxy()) {
 			InternalEObject oldFunction = (InternalEObject)function;
 			function = (FunctionType)eResolveProxy(oldFunction);
-			if (function != oldFunction) {
-				if (eNotificationRequired())
+			if(function != oldFunction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.FUNCTION_TRIGGER__FUNCTION, oldFunction, function));
 			}
 		}
@@ -324,14 +346,15 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype getFunctionPrototype() {
-		if (functionPrototype != null && functionPrototype.eIsProxy()) {
+		if(functionPrototype != null && functionPrototype.eIsProxy()) {
 			InternalEObject oldFunctionPrototype = (InternalEObject)functionPrototype;
 			functionPrototype = (FunctionPrototype)eResolveProxy(oldFunctionPrototype);
-			if (functionPrototype != oldFunctionPrototype) {
-				if (eNotificationRequired())
+			if(functionPrototype != oldFunctionPrototype) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE, oldFunctionPrototype, functionPrototype));
 			}
 		}
@@ -341,10 +364,11 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, BehaviorPackage.FUNCTION_TRIGGER__MODE);
 		}
 		return mode;
@@ -353,10 +377,11 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPort> getPort() {
-		if (port == null) {
+		if(port == null) {
 			port = new EObjectResolvingEList<FunctionPort>(FunctionPort.class, this, BehaviorPackage.FUNCTION_TRIGGER__PORT);
 		}
 		return port;
@@ -365,6 +390,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTriggerCondition() {
@@ -374,6 +400,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TriggerPolicyKind getTriggerPolicy() {
@@ -383,50 +410,54 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunction(FunctionType newFunction) {
 		FunctionType oldFunction = function;
 		function = newFunction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_TRIGGER__FUNCTION, oldFunction, function));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunctionPrototype(FunctionPrototype newFunctionPrototype) {
 		FunctionPrototype oldFunctionPrototype = functionPrototype;
 		functionPrototype = newFunctionPrototype;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_TRIGGER__FUNCTION_PROTOTYPE, oldFunctionPrototype, functionPrototype));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTriggerCondition(String newTriggerCondition) {
 		String oldTriggerCondition = triggerCondition;
 		triggerCondition = newTriggerCondition;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_CONDITION, oldTriggerCondition, triggerCondition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -436,6 +467,7 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -445,35 +477,39 @@ public class FunctionTriggerImpl extends EAElementImpl implements FunctionTrigge
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_TRIGGER__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTriggerPolicy(TriggerPolicyKind newTriggerPolicy) {
 		TriggerPolicyKind oldTriggerPolicy = triggerPolicy;
 		triggerPolicy = newTriggerPolicy == null ? TRIGGER_POLICY_EDEFAULT : newTriggerPolicy;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.FUNCTION_TRIGGER__TRIGGER_POLICY, oldTriggerPolicy, triggerPolicy));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (triggerCondition: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeGroupImpl.java
index 4cd2caebaed..8786b3b17cd 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeGroupImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getPrecondition <em>Precondition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getPrecondition <em>Precondition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeGroupImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGroup {
+
 	/**
 	 * The default value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrecondition()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	 * The cached value of the '{@link #getPrecondition() <em>Precondition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrecondition()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	 * The cached value of the '{@link #getMode() <em>Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -88,6 +93,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModeGroupImpl() {
@@ -97,18 +103,20 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BehaviorPackage.MODE_GROUP__PRECONDITION:
-				return getPrecondition();
-			case BehaviorPackage.MODE_GROUP__MODE:
-				return getMode();
-			case BehaviorPackage.MODE_GROUP__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case BehaviorPackage.MODE_GROUP__PRECONDITION:
+			return getPrecondition();
+		case BehaviorPackage.MODE_GROUP__MODE:
+			return getMode();
+		case BehaviorPackage.MODE_GROUP__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -116,17 +124,18 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.MODE_GROUP__PRECONDITION:
-				return PRECONDITION_EDEFAULT == null ? precondition != null : !PRECONDITION_EDEFAULT.equals(precondition);
-			case BehaviorPackage.MODE_GROUP__MODE:
-				return mode != null && !mode.isEmpty();
-			case BehaviorPackage.MODE_GROUP__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case BehaviorPackage.MODE_GROUP__PRECONDITION:
+			return PRECONDITION_EDEFAULT == null ? precondition != null : !PRECONDITION_EDEFAULT.equals(precondition);
+		case BehaviorPackage.MODE_GROUP__MODE:
+			return mode != null && !mode.isEmpty();
+		case BehaviorPackage.MODE_GROUP__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -134,22 +143,23 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BehaviorPackage.MODE_GROUP__PRECONDITION:
-				setPrecondition((String)newValue);
-				return;
-			case BehaviorPackage.MODE_GROUP__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
-			case BehaviorPackage.MODE_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.MODE_GROUP__PRECONDITION:
+			setPrecondition((String)newValue);
+			return;
+		case BehaviorPackage.MODE_GROUP__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
+		case BehaviorPackage.MODE_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -157,6 +167,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,20 +178,21 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.MODE_GROUP__PRECONDITION:
-				setPrecondition(PRECONDITION_EDEFAULT);
-				return;
-			case BehaviorPackage.MODE_GROUP__MODE:
-				getMode().clear();
-				return;
-			case BehaviorPackage.MODE_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.MODE_GROUP__PRECONDITION:
+			setPrecondition(PRECONDITION_EDEFAULT);
+			return;
+		case BehaviorPackage.MODE_GROUP__MODE:
+			getMode().clear();
+			return;
+		case BehaviorPackage.MODE_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -188,10 +200,11 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, BehaviorPackage.MODE_GROUP__MODE);
 		}
 		return mode;
@@ -200,14 +213,15 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.MODE_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -217,6 +231,7 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -226,18 +241,20 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.MODE_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getPrecondition() {
@@ -247,23 +264,26 @@ public class ModeGroupImpl extends TraceableSpecificationImpl implements ModeGro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPrecondition(String newPrecondition) {
 		String oldPrecondition = precondition;
 		precondition = newPrecondition;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.MODE_GROUP__PRECONDITION, oldPrecondition, precondition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (precondition: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeImpl.java
index 7f956e538ed..cfbf950d32f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/impl/ModeImpl.java
@@ -31,18 +31,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.behavior.impl.ModeImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ModeImpl extends EAElementImpl implements Mode {
+
 	/**
 	 * The default value of the '{@link #getCondition() <em>Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -53,6 +55,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -63,6 +66,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModeImpl() {
@@ -81,16 +86,18 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BehaviorPackage.MODE__CONDITION:
-				return getCondition();
-			case BehaviorPackage.MODE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case BehaviorPackage.MODE__CONDITION:
+			return getCondition();
+		case BehaviorPackage.MODE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -98,15 +105,16 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.MODE__CONDITION:
-				return CONDITION_EDEFAULT == null ? condition != null : !CONDITION_EDEFAULT.equals(condition);
-			case BehaviorPackage.MODE__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case BehaviorPackage.MODE__CONDITION:
+			return CONDITION_EDEFAULT == null ? condition != null : !CONDITION_EDEFAULT.equals(condition);
+		case BehaviorPackage.MODE__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -114,17 +122,18 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BehaviorPackage.MODE__CONDITION:
-				setCondition((String)newValue);
-				return;
-			case BehaviorPackage.MODE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.MODE__CONDITION:
+			setCondition((String)newValue);
+			return;
+		case BehaviorPackage.MODE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -132,6 +141,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,17 +152,18 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BehaviorPackage.MODE__CONDITION:
-				setCondition(CONDITION_EDEFAULT);
-				return;
-			case BehaviorPackage.MODE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case BehaviorPackage.MODE__CONDITION:
+			setCondition(CONDITION_EDEFAULT);
+			return;
+		case BehaviorPackage.MODE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -160,6 +171,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCondition() {
@@ -169,26 +181,28 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCondition(String newCondition) {
 		String oldCondition = condition;
 		condition = newCondition;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.MODE__CONDITION, oldCondition, condition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BehaviorPackage.MODE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -198,6 +212,7 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -207,23 +222,26 @@ public class ModeImpl extends EAElementImpl implements Mode {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BehaviorPackage.MODE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (condition: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorAdapterFactory.java
index 11c6073d4ad..24bdd0bcd90 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.eastadl.behavior.*;

 import org.eclipse.papyrus.eastadl.behavior.Behavior;

 import org.eclipse.papyrus.eastadl.behavior.BehaviorPackage;

 import org.eclipse.papyrus.eastadl.behavior.FunctionBehavior;

@@ -32,8 +33,9 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 

 

 /**

- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage

  * @generated

  */

@@ -42,6 +44,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static BehaviorPackage modelPackage;

@@ -50,58 +53,70 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected BehaviorSwitch<Adapter> modelSwitch = new BehaviorSwitch<Adapter>() {

-			@Override

-			public Adapter caseFunctionBehavior(FunctionBehavior object) {

-				return createFunctionBehaviorAdapter();

-			}

-			@Override

-			public Adapter caseMode(Mode object) {

-				return createModeAdapter();

-			}

-			@Override

-			public Adapter caseBehavior(Behavior object) {

-				return createBehaviorAdapter();

-			}

-			@Override

-			public Adapter caseFunctionTrigger(FunctionTrigger object) {

-				return createFunctionTriggerAdapter();

-			}

-			@Override

-			public Adapter caseModeGroup(ModeGroup object) {

-				return createModeGroupAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter caseEAPackageableElement(EAPackageableElement object) {

-				return createEAPackageableElementAdapter();

-			}

-			@Override

-			public Adapter caseTraceableSpecification(TraceableSpecification object) {

-				return createTraceableSpecificationAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseFunctionBehavior(FunctionBehavior object) {

+			return createFunctionBehaviorAdapter();

+		}

+

+		@Override

+		public Adapter caseMode(Mode object) {

+			return createModeAdapter();

+		}

+

+		@Override

+		public Adapter caseBehavior(Behavior object) {

+			return createBehaviorAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionTrigger(FunctionTrigger object) {

+			return createFunctionTriggerAdapter();

+		}

+

+		@Override

+		public Adapter caseModeGroup(ModeGroup object) {

+			return createModeGroupAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter caseEAPackageableElement(EAPackageableElement object) {

+			return createEAPackageableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseTraceableSpecification(TraceableSpecification object) {

+			return createTraceableSpecificationAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = BehaviorPackage.eINSTANCE;

 		}

 	}

@@ -109,7 +124,9 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -124,6 +141,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Behavior

 	 * @generated

@@ -138,6 +156,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -147,11 +166,13 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

+	 * <em>EA Packageable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

 	 * @generated

@@ -164,6 +185,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -177,6 +199,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionBehavior

 	 * @generated

@@ -191,6 +214,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.behavior.FunctionTrigger

 	 * @generated

@@ -205,6 +229,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.behavior.Mode

 	 * @generated

@@ -219,6 +244,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.behavior.ModeGroup

 	 * @generated

@@ -233,6 +259,7 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -242,11 +269,13 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

+	 * <em>Traceable Specification</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

 	 * @generated

@@ -260,15 +289,16 @@ public class BehaviorAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceFactoryImpl.java
index bf3f790cbe6..9dcae45e70b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.behavior.util.BehaviorResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class BehaviorResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class BehaviorResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceImpl.java
index 71bc5f8244c..784a281afb2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.behavior.util.BehaviorResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class BehaviorResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public BehaviorResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorSwitch.java
index 03b24910f0b..412f5aa9caf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.behavior.util;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.eastadl.behavior.*;

 import org.eclipse.papyrus.eastadl.behavior.Behavior;

 import org.eclipse.papyrus.eastadl.behavior.BehaviorPackage;

 import org.eclipse.papyrus.eastadl.behavior.FunctionBehavior;

@@ -36,6 +37,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.behavior.BehaviorPackage

  * @generated

  */

@@ -44,6 +46,7 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static BehaviorPackage modelPackage;

@@ -51,10 +54,11 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorSwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = BehaviorPackage.eINSTANCE;

 		}

 	}

@@ -63,6 +67,7 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -78,7 +83,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Behavior</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -93,7 +100,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -108,7 +117,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -123,7 +134,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Behavior</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -138,7 +151,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Trigger</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -153,7 +168,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Mode</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -168,7 +185,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Mode Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -183,7 +202,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -198,7 +219,9 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -213,7 +236,7 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -226,52 +249,73 @@ public class BehaviorSwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case BehaviorPackage.FUNCTION_BEHAVIOR: {

-				FunctionBehavior functionBehavior = (FunctionBehavior)theEObject;

-				T result = caseFunctionBehavior(functionBehavior);

-				if (result == null) result = caseContext(functionBehavior);

-				if (result == null) result = caseEAElement(functionBehavior);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case BehaviorPackage.MODE: {

-				Mode mode = (Mode)theEObject;

-				T result = caseMode(mode);

-				if (result == null) result = caseEAElement(mode);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case BehaviorPackage.BEHAVIOR: {

-				Behavior behavior = (Behavior)theEObject;

-				T result = caseBehavior(behavior);

-				if (result == null) result = caseContext(behavior);

-				if (result == null) result = caseEAElement(behavior);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case BehaviorPackage.FUNCTION_TRIGGER: {

-				FunctionTrigger functionTrigger = (FunctionTrigger)theEObject;

-				T result = caseFunctionTrigger(functionTrigger);

-				if (result == null) result = caseEAElement(functionTrigger);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case BehaviorPackage.MODE_GROUP: {

-				ModeGroup modeGroup = (ModeGroup)theEObject;

-				T result = caseModeGroup(modeGroup);

-				if (result == null) result = caseTraceableSpecification(modeGroup);

-				if (result == null) result = caseEAPackageableElement(modeGroup);

-				if (result == null) result = caseEAElement(modeGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case BehaviorPackage.FUNCTION_BEHAVIOR:

+		{

+			FunctionBehavior functionBehavior = (FunctionBehavior)theEObject;

+			T result = caseFunctionBehavior(functionBehavior);

+			if(result == null)

+				result = caseContext(functionBehavior);

+			if(result == null)

+				result = caseEAElement(functionBehavior);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case BehaviorPackage.MODE:

+		{

+			Mode mode = (Mode)theEObject;

+			T result = caseMode(mode);

+			if(result == null)

+				result = caseEAElement(mode);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case BehaviorPackage.BEHAVIOR:

+		{

+			Behavior behavior = (Behavior)theEObject;

+			T result = caseBehavior(behavior);

+			if(result == null)

+				result = caseContext(behavior);

+			if(result == null)

+				result = caseEAElement(behavior);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case BehaviorPackage.FUNCTION_TRIGGER:

+		{

+			FunctionTrigger functionTrigger = (FunctionTrigger)theEObject;

+			T result = caseFunctionTrigger(functionTrigger);

+			if(result == null)

+				result = caseEAElement(functionTrigger);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case BehaviorPackage.MODE_GROUP:

+		{

+			ModeGroup modeGroup = (ModeGroup)theEObject;

+			T result = caseModeGroup(modeGroup);

+			if(result == null)

+				result = caseTraceableSpecification(modeGroup);

+			if(result == null)

+				result = caseEAPackageableElement(modeGroup);

+			if(result == null)

+				result = caseEAElement(modeGroup);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorXMLProcessor.java
index f6920565132..771284599be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/behavior/util/BehaviorXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.behavior.BehaviorPackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class BehaviorXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class BehaviorXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BehaviorXMLProcessor() {

@@ -49,7 +51,7 @@ public class BehaviorXMLProcessor extends XMLProcessor {
 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new BehaviorResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new BehaviorResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ControllabilityClassKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ControllabilityClassKind.java
index 9098fca9130..ba03643a85f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ControllabilityClassKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ControllabilityClassKind.java
@@ -27,14 +27,16 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The ControllabilityClassKind is an enumeration metaclass with enumeration literals indicating controllability attributes C0, C1, C2 or C3 in accordance with ISO26262.
+ * The ControllabilityClassKind is an enumeration metaclass with enumeration literals indicating controllability attributes C0, C1, C2 or C3 in
+ * accordance with ISO26262.
  * 
  * Semantics:
  * The semantics is defined at each enumeration literal and fully defined in the ISO26262 standard.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getControllabilityClassKind()
  * @model
  * @generated
@@ -44,6 +46,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * The '<em><b>C1</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #C1_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * The '<em><b>C2</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #C2_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +68,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * The '<em><b>C3</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #C3_VALUE
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * The '<em><b>C0</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #C0_VALUE
 	 * @generated
 	 * @ordered
@@ -87,6 +93,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Simply controllable
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #C1
 	 * @model
 	 * @generated
@@ -101,6 +108,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Normally controllable
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #C2
 	 * @model
 	 * @generated
@@ -115,6 +123,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Difficult to control or uncontrollable
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #C3
 	 * @model
 	 * @generated
@@ -129,6 +138,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Controllable in general
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #C0
 	 * @model
 	 * @generated
@@ -140,20 +150,16 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * An array of all the '<em><b>Controllability Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ControllabilityClassKind[] VALUES_ARRAY =
-		new ControllabilityClassKind[] {
-			C1,
-			C2,
-			C3,
-			C0,
-		};
+	private static final ControllabilityClassKind[] VALUES_ARRAY = new ControllabilityClassKind[]{ C1, C2, C3, C0, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Controllability Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ControllabilityClassKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -162,14 +168,19 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * Returns the '<em><b>Controllability Class Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ControllabilityClassKind get(int value) {
-		switch (value) {
-			case C1_VALUE: return C1;
-			case C2_VALUE: return C2;
-			case C3_VALUE: return C3;
-			case C0_VALUE: return C0;
+		switch(value) {
+		case C1_VALUE:
+			return C1;
+		case C2_VALUE:
+			return C2;
+		case C3_VALUE:
+			return C3;
+		case C0_VALUE:
+			return C0;
 		}
 		return null;
 	}
@@ -178,12 +189,13 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * Returns the '<em><b>Controllability Class Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ControllabilityClassKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ControllabilityClassKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -194,12 +206,13 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * Returns the '<em><b>Controllability Class Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ControllabilityClassKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ControllabilityClassKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -209,6 +222,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -216,6 +230,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -223,6 +238,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -231,6 +247,7 @@ public enum ControllabilityClassKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ControllabilityClassKind(int value, String name, String literal) {
@@ -242,39 +259,43 @@ public enum ControllabilityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //ControllabilityClassKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Dependability.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Dependability.java
index 0e790d14792..103d45f1f5d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Dependability.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Dependability.java
@@ -32,40 +32,41 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Dependability</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFunctionalSafetyConcept <em>Functional Safety Concept</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyGoal <em>Safety Goal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getTechnicalSafetyConcept <em>Technical Safety Concept</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getHazardousEvent <em>Hazardous Event</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFeatureFlaw <em>Feature Flaw</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getItem <em>Item</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getEADatatype <em>EA Datatype</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFaultFailure <em>Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getQuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyConstraint <em>Safety Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyCase <em>Safety Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getErrorModelType <em>Error Model Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFunctionalSafetyConcept <em>Functional Safety Concept</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyGoal <em>Safety Goal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getTechnicalSafetyConcept <em>Technical Safety Concept</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getHazardousEvent <em>Hazardous Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFeatureFlaw <em>Feature Flaw</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getEADatatype <em>EA Datatype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFaultFailure <em>Fault Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getQuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyConstraint <em>Safety Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyCase <em>Safety Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getErrorModelType <em>Error Model Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability()
  * @model
  * @generated
  */
 public interface Dependability extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_Base_Class()
@@ -78,7 +79,9 @@ public interface Dependability extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -88,10 +91,10 @@ public interface Dependability extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_Base_Package()
@@ -104,7 +107,9 @@ public interface Dependability extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -115,10 +120,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Error Model Type</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Error Model Type</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Error Model Type</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_ErrorModelType()
 	 * @model ordered="false"
@@ -131,10 +136,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fault Failure</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Fault Failure</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fault Failure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_FaultFailure()
 	 * @model ordered="false"
@@ -147,10 +152,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Feature Flaw</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Feature Flaw</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Feature Flaw</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_FeatureFlaw()
 	 * @model ordered="false"
@@ -163,10 +168,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Functional Safety Concept</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Functional Safety Concept</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Functional Safety Concept</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_FunctionalSafetyConcept()
 	 * @model ordered="false"
@@ -179,10 +184,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hazardous Event</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hazardous Event</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hazardous Event</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_HazardousEvent()
 	 * @model ordered="false"
@@ -195,10 +200,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.Item}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Item</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Item</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Item</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_Item()
 	 * @model ordered="false"
@@ -211,10 +216,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>EA Datatype</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>EA Datatype</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>EA Datatype</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_EADatatype()
 	 * @model ordered="false"
@@ -227,10 +232,11 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Quantitative Safety Constraint</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Quantitative Safety Constraint</em>' reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Quantitative Safety Constraint</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_QuantitativeSafetyConstraint()
 	 * @model ordered="false"
@@ -243,10 +249,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Safety Case</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Safety Case</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_SafetyCase()
 	 * @model ordered="false"
@@ -259,10 +265,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Safety Constraint</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Safety Constraint</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Constraint</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_SafetyConstraint()
 	 * @model ordered="false"
@@ -275,10 +281,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Safety Goal</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Safety Goal</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Goal</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_SafetyGoal()
 	 * @model ordered="false"
@@ -291,10 +297,10 @@ public interface Dependability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Technical Safety Concept</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Technical Safety Concept</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Technical Safety Concept</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDependability_TechnicalSafetyConcept()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityFactory.java
index 0e73d3c4ab0..4f2fdb2c198 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage
  * @generated
  */
 public interface DependabilityFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DependabilityFactory eINSTANCE = org.eclipse.papyrus.eastadl.dependability.impl.DependabilityFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Dependability</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dependability</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Flaw</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Feature Flaw</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Hazard</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hazard</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Hazardous Event</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hazardous Event</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Item</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Item</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface DependabilityFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityPackage.java
index 2a1b290294d..879ddffe71d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DependabilityPackage.java
@@ -28,355 +28,452 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * Dependability of a system is the ability to avoid service failures that are more frequent and more severe than is acceptable. Dependability includes several aspects, namely Availability, Reliability, Safety, Integrity and Maintainability. The Dependability package includes support for defining and classifying safety requirements through preliminary Hazard Analysis Risk Assessment, tracing and categorizing safety requirements according to role in safety life-cycle, formalizing safety requirements using safety constraints, formalizing and assessing fault propagation through error models and organizing evidence of safety in a Safety Case.
+ * Dependability of a system is the ability to avoid service failures that are more frequent and more severe than is acceptable. Dependability
+ * includes several aspects, namely Availability, Reliability, Safety, Integrity and Maintainability. The Dependability package includes support for
+ * defining and classifying safety requirements through preliminary Hazard Analysis Risk Assessment, tracing and categorizing safety requirements
+ * according to role in safety life-cycle, formalizing safety requirements using safety constraints, formalizing and assessing fault propagation
+ * through error models and organizing evidence of safety in a Safety Case.
  * The support for safety is designed to support the automotive standard for Functional Safety, ISO/DIS 26262.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityFactory
  * @model kind="package"
  * @generated
  */
 public interface DependabilityPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl <em>Hazardous Event</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getHazardousEvent()
 		 * @generated
 		 */
 		EClass HAZARDOUS_EVENT = eINSTANCE.getHazardousEvent();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__BASE_CLASS = eINSTANCE.getHazardousEvent_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Controllability</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HAZARDOUS_EVENT__CONTROLLABILITY = eINSTANCE.getHazardousEvent_Controllability();
+
 		/**
 		 * The meta object literal for the '<em><b>Exposure</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HAZARDOUS_EVENT__EXPOSURE = eINSTANCE.getHazardousEvent_Exposure();
+
 		/**
 		 * The meta object literal for the '<em><b>Hazard Classification</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HAZARDOUS_EVENT__HAZARD_CLASSIFICATION = eINSTANCE.getHazardousEvent_HazardClassification();
+
 		/**
 		 * The meta object literal for the '<em><b>Severity</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HAZARDOUS_EVENT__SEVERITY = eINSTANCE.getHazardousEvent_Severity();
+
 		/**
 		 * The meta object literal for the '<em><b>Classification Assumptions</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS = eINSTANCE.getHazardousEvent_ClassificationAssumptions();
+
 		/**
 		 * The meta object literal for the '<em><b>Hazard</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__HAZARD = eINSTANCE.getHazardousEvent_Hazard();
+
 		/**
 		 * The meta object literal for the '<em><b>Traffic</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__TRAFFIC = eINSTANCE.getHazardousEvent_Traffic();
+
 		/**
 		 * The meta object literal for the '<em><b>Environment</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__ENVIRONMENT = eINSTANCE.getHazardousEvent_Environment();
+
 		/**
 		 * The meta object literal for the '<em><b>Operational Situation Use Case</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE = eINSTANCE.getHazardousEvent_OperationalSituationUseCase();
+
 		/**
 		 * The meta object literal for the '<em><b>Operating Mode</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__OPERATING_MODE = eINSTANCE.getHazardousEvent_OperatingMode();
+
 		/**
 		 * The meta object literal for the '<em><b>External Measures</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARDOUS_EVENT__EXTERNAL_MEASURES = eINSTANCE.getHazardousEvent_ExternalMeasures();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl <em>Hazard</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getHazard()
 		 * @generated
 		 */
 		EClass HAZARD = eINSTANCE.getHazard();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARD__BASE_CLASS = eINSTANCE.getHazard_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Malfunction</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARD__MALFUNCTION = eINSTANCE.getHazard_Malfunction();
+
 		/**
 		 * The meta object literal for the '<em><b>Item</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HAZARD__ITEM = eINSTANCE.getHazard_Item();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl <em>Feature Flaw</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getFeatureFlaw()
 		 * @generated
 		 */
 		EClass FEATURE_FLAW = eINSTANCE.getFeatureFlaw();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FEATURE_FLAW__BASE_CLASS = eINSTANCE.getFeatureFlaw_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Item</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FEATURE_FLAW__ITEM = eINSTANCE.getFeatureFlaw_Item();
+
 		/**
 		 * The meta object literal for the '<em><b>Non Fulfilled Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FEATURE_FLAW__NON_FULFILLED_REQUIREMENT = eINSTANCE.getFeatureFlaw_NonFulfilledRequirement();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl <em>Item</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getItem()
 		 * @generated
 		 */
 		EClass ITEM = eINSTANCE.getItem();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ITEM__BASE_CLASS = eINSTANCE.getItem_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Development Category</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ITEM__DEVELOPMENT_CATEGORY = eINSTANCE.getItem_DevelopmentCategory();
+
 		/**
 		 * The meta object literal for the '<em><b>Vehicle Feature</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ITEM__VEHICLE_FEATURE = eINSTANCE.getItem_VehicleFeature();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl <em>Dependability</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getDependability()
 		 * @generated
 		 */
 		EClass DEPENDABILITY = eINSTANCE.getDependability();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__BASE_CLASS = eINSTANCE.getDependability_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__BASE_PACKAGE = eINSTANCE.getDependability_Base_Package();
+
 		/**
 		 * The meta object literal for the '<em><b>Functional Safety Concept</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT = eINSTANCE.getDependability_FunctionalSafetyConcept();
+
 		/**
 		 * The meta object literal for the '<em><b>Safety Goal</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__SAFETY_GOAL = eINSTANCE.getDependability_SafetyGoal();
+
 		/**
 		 * The meta object literal for the '<em><b>Technical Safety Concept</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT = eINSTANCE.getDependability_TechnicalSafetyConcept();
+
 		/**
 		 * The meta object literal for the '<em><b>Hazardous Event</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__HAZARDOUS_EVENT = eINSTANCE.getDependability_HazardousEvent();
+
 		/**
 		 * The meta object literal for the '<em><b>Feature Flaw</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__FEATURE_FLAW = eINSTANCE.getDependability_FeatureFlaw();
+
 		/**
 		 * The meta object literal for the '<em><b>Item</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__ITEM = eINSTANCE.getDependability_Item();
+
 		/**
 		 * The meta object literal for the '<em><b>EA Datatype</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__EA_DATATYPE = eINSTANCE.getDependability_EADatatype();
+
 		/**
 		 * The meta object literal for the '<em><b>Fault Failure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__FAULT_FAILURE = eINSTANCE.getDependability_FaultFailure();
+
 		/**
 		 * The meta object literal for the '<em><b>Quantitative Safety Constraint</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT = eINSTANCE.getDependability_QuantitativeSafetyConstraint();
+
 		/**
 		 * The meta object literal for the '<em><b>Safety Constraint</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__SAFETY_CONSTRAINT = eINSTANCE.getDependability_SafetyConstraint();
+
 		/**
 		 * The meta object literal for the '<em><b>Safety Case</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__SAFETY_CASE = eINSTANCE.getDependability_SafetyCase();
+
 		/**
 		 * The meta object literal for the '<em><b>Error Model Type</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEPENDABILITY__ERROR_MODEL_TYPE = eINSTANCE.getDependability_ErrorModelType();
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind <em>Controllability Class Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
+		 * <em>Controllability Class Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getControllabilityClassKind()
 		 * @generated
 		 */
 		EEnum CONTROLLABILITY_CLASS_KIND = eINSTANCE.getControllabilityClassKind();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.ExposureClassKind <em>Exposure Class Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.ExposureClassKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getExposureClassKind()
 		 * @generated
 		 */
 		EEnum EXPOSURE_CLASS_KIND = eINSTANCE.getExposureClassKind();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.SeverityClassKind <em>Severity Class Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.SeverityClassKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getSeverityClassKind()
 		 * @generated
 		 */
 		EEnum SEVERITY_CLASS_KIND = eINSTANCE.getSeverityClassKind();
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind <em>Development Category Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
+		 * <em>Development Category Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getDevelopmentCategoryKind()
 		 * @generated
@@ -389,6 +486,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "dependability";
@@ -397,6 +495,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Dependability/1";
@@ -405,6 +504,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Dependability";
@@ -413,6 +513,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DependabilityPackage eINSTANCE = org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl.init();
@@ -422,6 +523,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl <em>Hazardous Event</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getHazardousEvent()
 	 * @generated
@@ -432,6 +534,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -441,6 +544,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -450,6 +554,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -459,6 +564,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -468,6 +574,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -477,6 +584,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -486,6 +594,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Controllability</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -495,6 +604,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Exposure</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -504,6 +614,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Hazard Classification</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -513,6 +624,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Severity</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -522,6 +634,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Classification Assumptions</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -531,6 +644,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Hazard</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +654,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Traffic</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +664,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Environment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,6 +674,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Operational Situation Use Case</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -567,6 +684,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Operating Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -576,6 +694,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>External Measures</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -585,6 +704,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Hazardous Event</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -594,6 +714,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl <em>Hazard</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getHazard()
 	 * @generated
@@ -604,6 +725,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -613,6 +735,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -622,6 +745,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -631,6 +755,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -640,6 +765,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -649,6 +775,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -658,6 +785,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Malfunction</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -667,6 +795,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Item</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -676,6 +805,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Hazard</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -685,6 +815,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl <em>Feature Flaw</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getFeatureFlaw()
 	 * @generated
@@ -695,6 +826,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -704,6 +836,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -713,6 +846,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -722,6 +856,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -731,6 +866,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -740,6 +876,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -749,6 +886,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Item</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -758,6 +896,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Non Fulfilled Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -767,6 +906,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Flaw</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -776,6 +916,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl <em>Item</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getItem()
 	 * @generated
@@ -786,6 +927,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -795,6 +937,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -804,6 +947,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -813,6 +957,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -822,6 +967,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Development Category</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -831,6 +977,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Vehicle Feature</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -840,6 +987,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Item</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -849,6 +997,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl <em>Dependability</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getDependability()
 	 * @generated
@@ -859,6 +1008,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -868,6 +1018,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -877,6 +1028,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -886,6 +1038,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -895,6 +1048,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -904,6 +1058,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -913,6 +1068,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -922,6 +1078,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Functional Safety Concept</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -931,6 +1088,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Goal</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -940,6 +1098,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Technical Safety Concept</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -949,6 +1108,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Hazardous Event</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -958,6 +1118,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature Flaw</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -967,6 +1128,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Item</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -976,6 +1138,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>EA Datatype</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -985,6 +1148,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Fault Failure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -994,6 +1158,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Quantitative Safety Constraint</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1003,6 +1168,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Constraint</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1012,6 +1178,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Case</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1021,6 +1188,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Error Model Type</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1030,15 +1198,18 @@ public interface DependabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Dependability</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DEPENDABILITY_FEATURE_COUNT = ElementsPackage.CONTEXT_FEATURE_COUNT + 14;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind <em>Controllability Class Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind <em>Controllability Class Kind</em>}'
+	 * enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getControllabilityClassKind()
 	 * @generated
@@ -1049,6 +1220,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.ExposureClassKind <em>Exposure Class Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.ExposureClassKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getExposureClassKind()
 	 * @generated
@@ -1059,6 +1231,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.SeverityClassKind <em>Severity Class Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.SeverityClassKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getSeverityClassKind()
 	 * @generated
@@ -1069,6 +1242,7 @@ public interface DependabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind <em>Development Category Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.impl.DependabilityPackageImpl#getDevelopmentCategoryKind()
 	 * @generated
@@ -1076,9 +1250,11 @@ public interface DependabilityPackage extends EPackage {
 	int DEVELOPMENT_CATEGORY_KIND = 8;
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind <em>Controllability Class Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
+	 * <em>Controllability Class Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Controllability Class Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
 	 * @generated
@@ -1089,6 +1265,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.Dependability <em>Dependability</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Dependability</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability
 	 * @generated
@@ -1099,6 +1276,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Class()
 	 * @see #getDependability()
@@ -1107,9 +1285,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getBase_Package()
 	 * @see #getDependability()
@@ -1118,9 +1298,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getErrorModelType <em>Error Model Type</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getErrorModelType
+	 * <em>Error Model Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Error Model Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getErrorModelType()
 	 * @see #getDependability()
@@ -1129,9 +1311,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_ErrorModelType();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFaultFailure <em>Fault Failure</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFaultFailure
+	 * <em>Fault Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Fault Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getFaultFailure()
 	 * @see #getDependability()
@@ -1140,9 +1324,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_FaultFailure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFeatureFlaw <em>Feature Flaw</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFeatureFlaw
+	 * <em>Feature Flaw</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Feature Flaw</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getFeatureFlaw()
 	 * @see #getDependability()
@@ -1151,9 +1337,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_FeatureFlaw();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFunctionalSafetyConcept <em>Functional Safety Concept</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getFunctionalSafetyConcept
+	 * <em>Functional Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Functional Safety Concept</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getFunctionalSafetyConcept()
 	 * @see #getDependability()
@@ -1162,9 +1350,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_FunctionalSafetyConcept();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getHazardousEvent <em>Hazardous Event</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getHazardousEvent
+	 * <em>Hazardous Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hazardous Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getHazardousEvent()
 	 * @see #getDependability()
@@ -1176,6 +1366,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getItem <em>Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Item</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getItem()
 	 * @see #getDependability()
@@ -1184,9 +1375,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_Item();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getEADatatype <em>EA Datatype</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getEADatatype
+	 * <em>EA Datatype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>EA Datatype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getEADatatype()
 	 * @see #getDependability()
@@ -1195,9 +1388,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_EADatatype();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getQuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getQuantitativeSafetyConstraint
+	 * <em>Quantitative Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Quantitative Safety Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getQuantitativeSafetyConstraint()
 	 * @see #getDependability()
@@ -1206,9 +1401,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_QuantitativeSafetyConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyCase <em>Safety Case</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyCase
+	 * <em>Safety Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safety Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyCase()
 	 * @see #getDependability()
@@ -1217,9 +1414,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_SafetyCase();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyConstraint <em>Safety Constraint</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyConstraint
+	 * <em>Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safety Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyConstraint()
 	 * @see #getDependability()
@@ -1228,9 +1427,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_SafetyConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyGoal <em>Safety Goal</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyGoal
+	 * <em>Safety Goal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safety Goal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getSafetyGoal()
 	 * @see #getDependability()
@@ -1239,9 +1440,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getDependability_SafetyGoal();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getTechnicalSafetyConcept <em>Technical Safety Concept</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Dependability#getTechnicalSafetyConcept
+	 * <em>Technical Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Technical Safety Concept</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability#getTechnicalSafetyConcept()
 	 * @see #getDependability()
@@ -1253,15 +1456,18 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	DependabilityFactory getDependabilityFactory();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind <em>Development Category Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind <em>Development Category Kind</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Development Category Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
 	 * @generated
@@ -1272,6 +1478,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.ExposureClassKind <em>Exposure Class Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Exposure Class Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ExposureClassKind
 	 * @generated
@@ -1282,6 +1489,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw <em>Feature Flaw</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Feature Flaw</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.FeatureFlaw
 	 * @generated
@@ -1292,6 +1500,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getBase_Class()
 	 * @see #getFeatureFlaw()
@@ -1303,6 +1512,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getItem <em>Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Item</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getItem()
 	 * @see #getFeatureFlaw()
@@ -1311,9 +1521,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getFeatureFlaw_Item();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getNonFulfilledRequirement <em>Non Fulfilled Requirement</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getNonFulfilledRequirement
+	 * <em>Non Fulfilled Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Non Fulfilled Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getNonFulfilledRequirement()
 	 * @see #getFeatureFlaw()
@@ -1325,6 +1537,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.Hazard <em>Hazard</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hazard</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Hazard
 	 * @generated
@@ -1335,6 +1548,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Hazard#getBase_Class()
 	 * @see #getHazard()
@@ -1346,6 +1560,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getItem <em>Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Item</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Hazard#getItem()
 	 * @see #getHazard()
@@ -1357,6 +1572,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getMalfunction <em>Malfunction</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Malfunction</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Hazard#getMalfunction()
 	 * @see #getHazard()
@@ -1368,6 +1584,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent <em>Hazardous Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hazardous Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent
 	 * @generated
@@ -1378,6 +1595,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getBase_Class()
 	 * @see #getHazardousEvent()
@@ -1386,9 +1604,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getHazardousEvent_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions <em>Classification Assumptions</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions
+	 * <em>Classification Assumptions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Classification Assumptions</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions()
 	 * @see #getHazardousEvent()
@@ -1397,9 +1617,11 @@ public interface DependabilityPackage extends EPackage {
 	EAttribute getHazardousEvent_ClassificationAssumptions();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability <em>Controllability</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability
+	 * <em>Controllability</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Controllability</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability()
 	 * @see #getHazardousEvent()
@@ -1408,9 +1630,11 @@ public interface DependabilityPackage extends EPackage {
 	EAttribute getHazardousEvent_Controllability();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getEnvironment <em>Environment</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getEnvironment
+	 * <em>Environment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Environment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getEnvironment()
 	 * @see #getHazardousEvent()
@@ -1422,6 +1646,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExposure <em>Exposure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Exposure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExposure()
 	 * @see #getHazardousEvent()
@@ -1430,9 +1655,11 @@ public interface DependabilityPackage extends EPackage {
 	EAttribute getHazardousEvent_Exposure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExternalMeasures <em>External Measures</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExternalMeasures
+	 * <em>External Measures</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>External Measures</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExternalMeasures()
 	 * @see #getHazardousEvent()
@@ -1444,6 +1671,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazard <em>Hazard</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hazard</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazard()
 	 * @see #getHazardousEvent()
@@ -1452,9 +1680,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getHazardousEvent_Hazard();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification <em>Hazard Classification</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification
+	 * <em>Hazard Classification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Hazard Classification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification()
 	 * @see #getHazardousEvent()
@@ -1463,9 +1693,11 @@ public interface DependabilityPackage extends EPackage {
 	EAttribute getHazardousEvent_HazardClassification();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperatingMode <em>Operating Mode</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperatingMode
+	 * <em>Operating Mode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Operating Mode</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperatingMode()
 	 * @see #getHazardousEvent()
@@ -1474,9 +1706,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getHazardousEvent_OperatingMode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperationalSituationUseCase <em>Operational Situation Use Case</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperationalSituationUseCase
+	 * <em>Operational Situation Use Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Operational Situation Use Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperationalSituationUseCase()
 	 * @see #getHazardousEvent()
@@ -1488,6 +1722,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getSeverity <em>Severity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Severity</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getSeverity()
 	 * @see #getHazardousEvent()
@@ -1499,6 +1734,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getTraffic <em>Traffic</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Traffic</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getTraffic()
 	 * @see #getHazardousEvent()
@@ -1510,6 +1746,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.Item <em>Item</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Item</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Item
 	 * @generated
@@ -1520,6 +1757,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.Item#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Item#getBase_Class()
 	 * @see #getItem()
@@ -1528,9 +1766,11 @@ public interface DependabilityPackage extends EPackage {
 	EReference getItem_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory <em>Development Category</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory
+	 * <em>Development Category</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Development Category</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory()
 	 * @see #getItem()
@@ -1539,9 +1779,11 @@ public interface DependabilityPackage extends EPackage {
 	EAttribute getItem_DevelopmentCategory();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Item#getVehicleFeature <em>Vehicle Feature</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.Item#getVehicleFeature
+	 * <em>Vehicle Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vehicle Feature</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Item#getVehicleFeature()
 	 * @see #getItem()
@@ -1553,6 +1795,7 @@ public interface DependabilityPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.SeverityClassKind <em>Severity Class Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Severity Class Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.SeverityClassKind
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DevelopmentCategoryKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DevelopmentCategoryKind.java
index d645f3cfea6..2827316dbb6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DevelopmentCategoryKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/DevelopmentCategoryKind.java
@@ -27,14 +27,16 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * DevelopmentCategoryKind in an enumeration with enumeration literals indicating whether the item is a modification of an existing item or if it is a new development.
+ * DevelopmentCategoryKind in an enumeration with enumeration literals indicating whether the item is a modification of an existing item or if it is a
+ * new development.
  * 
  * Semantics:
  * The semantics is defined at each enumeration literal and fully defined in the ISO26262 standard.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getDevelopmentCategoryKind()
  * @model
  * @generated
@@ -44,6 +46,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * The '<em><b>Modification Of Existing Item</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MODIFICATION_OF_EXISTING_ITEM_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * The '<em><b>New Item Development</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NEW_ITEM_DEVELOPMENT_VALUE
 	 * @generated
 	 * @ordered
@@ -67,6 +71,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * In case of a modification the relevant lifecycle sub-phases and activities shall be determined.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #MODIFICATION_OF_EXISTING_ITEM
 	 * @model name="modificationOfExistingItem"
 	 * @generated
@@ -81,6 +86,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * In case of a new development, the entire lifecycle shall be passed through.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #NEW_ITEM_DEVELOPMENT
 	 * @model name="newItemDevelopment"
 	 * @generated
@@ -92,18 +98,16 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * An array of all the '<em><b>Development Category Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final DevelopmentCategoryKind[] VALUES_ARRAY =
-		new DevelopmentCategoryKind[] {
-			MODIFICATION_OF_EXISTING_ITEM,
-			NEW_ITEM_DEVELOPMENT,
-		};
+	private static final DevelopmentCategoryKind[] VALUES_ARRAY = new DevelopmentCategoryKind[]{ MODIFICATION_OF_EXISTING_ITEM, NEW_ITEM_DEVELOPMENT, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Development Category Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<DevelopmentCategoryKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -112,12 +116,15 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * Returns the '<em><b>Development Category Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DevelopmentCategoryKind get(int value) {
-		switch (value) {
-			case MODIFICATION_OF_EXISTING_ITEM_VALUE: return MODIFICATION_OF_EXISTING_ITEM;
-			case NEW_ITEM_DEVELOPMENT_VALUE: return NEW_ITEM_DEVELOPMENT;
+		switch(value) {
+		case MODIFICATION_OF_EXISTING_ITEM_VALUE:
+			return MODIFICATION_OF_EXISTING_ITEM;
+		case NEW_ITEM_DEVELOPMENT_VALUE:
+			return NEW_ITEM_DEVELOPMENT;
 		}
 		return null;
 	}
@@ -126,12 +133,13 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * Returns the '<em><b>Development Category Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DevelopmentCategoryKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			DevelopmentCategoryKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -142,12 +150,13 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * Returns the '<em><b>Development Category Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DevelopmentCategoryKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			DevelopmentCategoryKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -157,6 +166,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -164,6 +174,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -171,6 +182,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -179,6 +191,7 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private DevelopmentCategoryKind(int value, String name, String literal) {
@@ -190,39 +203,43 @@ public enum DevelopmentCategoryKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //DevelopmentCategoryKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ExposureClassKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ExposureClassKind.java
index e0a498a4be7..583ae2f927a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ExposureClassKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/ExposureClassKind.java
@@ -27,14 +27,16 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The ExposureClassKind is an enumeration metaclass with enumeration literals indicating the probability attributes E1, E2, E3 or E4 in accordance with ISO26262.
+ * The ExposureClassKind is an enumeration metaclass with enumeration literals indicating the probability attributes E1, E2, E3 or E4 in accordance
+ * with ISO26262.
  * 
  * Semantics:
  * The semantics is defined at each enumeration literal and fully defined in the ISO26262 standard.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getExposureClassKind()
  * @model
  * @generated
@@ -44,6 +46,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * The '<em><b>E1</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #E1_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * The '<em><b>E2</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #E2_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +68,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * The '<em><b>E3</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #E3_VALUE
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * The '<em><b>E4</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #E4_VALUE
 	 * @generated
 	 * @ordered
@@ -88,6 +94,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * Rare events
 	 * Situations that occur less often yhan once a year for the great majority of drivers
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #E1
 	 * @model
 	 * @generated
@@ -103,6 +110,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * Sometimes
 	 * Situations that occur a few times a year for the great majority of drivers
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #E2
 	 * @model
 	 * @generated
@@ -118,6 +126,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * Quite often
 	 * Situations that occur once a month or more often for an average driver
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #E3
 	 * @model
 	 * @generated
@@ -133,6 +142,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * Often
 	 * All situations that occur during almost every drive on average
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #E4
 	 * @model
 	 * @generated
@@ -144,20 +154,16 @@ public enum ExposureClassKind implements Enumerator {
 	 * An array of all the '<em><b>Exposure Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ExposureClassKind[] VALUES_ARRAY =
-		new ExposureClassKind[] {
-			E1,
-			E2,
-			E3,
-			E4,
-		};
+	private static final ExposureClassKind[] VALUES_ARRAY = new ExposureClassKind[]{ E1, E2, E3, E4, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Exposure Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ExposureClassKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -166,14 +172,19 @@ public enum ExposureClassKind implements Enumerator {
 	 * Returns the '<em><b>Exposure Class Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ExposureClassKind get(int value) {
-		switch (value) {
-			case E1_VALUE: return E1;
-			case E2_VALUE: return E2;
-			case E3_VALUE: return E3;
-			case E4_VALUE: return E4;
+		switch(value) {
+		case E1_VALUE:
+			return E1;
+		case E2_VALUE:
+			return E2;
+		case E3_VALUE:
+			return E3;
+		case E4_VALUE:
+			return E4;
 		}
 		return null;
 	}
@@ -182,12 +193,13 @@ public enum ExposureClassKind implements Enumerator {
 	 * Returns the '<em><b>Exposure Class Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ExposureClassKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ExposureClassKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -198,12 +210,13 @@ public enum ExposureClassKind implements Enumerator {
 	 * Returns the '<em><b>Exposure Class Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ExposureClassKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ExposureClassKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -213,6 +226,7 @@ public enum ExposureClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -220,6 +234,7 @@ public enum ExposureClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -227,6 +242,7 @@ public enum ExposureClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -235,6 +251,7 @@ public enum ExposureClassKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ExposureClassKind(int value, String name, String literal) {
@@ -246,39 +263,43 @@ public enum ExposureClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //ExposureClassKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/FeatureFlaw.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/FeatureFlaw.java
index 248f7f2b2fa..a011e995865 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/FeatureFlaw.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/FeatureFlaw.java
@@ -24,39 +24,41 @@ import org.eclipse.papyrus.eastadl.requirements.Requirement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Feature Flaw</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * FeatureFlaw denotes an abstract failure of a set of items, i.e. an inability to fulfill one or several of its requirements.
  * 
  * Semantics:
- * FeatureFlaw represents functional anomalies derivable from each foreseeable source. nonFulfilledRequirements identifies those requirements that corresponds to the FeatureFlaw.
+ * FeatureFlaw represents functional anomalies derivable from each foreseeable source. nonFulfilledRequirements identifies those requirements that
+ * corresponds to the FeatureFlaw.
  * 
  * Extension:
  * UML::Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getItem <em>Item</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getNonFulfilledRequirement <em>Non Fulfilled Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getNonFulfilledRequirement <em>Non Fulfilled Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getFeatureFlaw()
  * @model
  * @generated
  */
 public interface FeatureFlaw extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getFeatureFlaw_Base_Class()
@@ -69,7 +71,9 @@ public interface FeatureFlaw extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -80,10 +84,10 @@ public interface FeatureFlaw extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.Item}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Item</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Item</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Item</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getFeatureFlaw_Item()
 	 * @model required="true" ordered="false"
@@ -96,10 +100,10 @@ public interface FeatureFlaw extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Non Fulfilled Requirement</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Non Fulfilled Requirement</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Non Fulfilled Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getFeatureFlaw_NonFulfilledRequirement()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Hazard.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Hazard.java
index c68ba2e96a8..72bc4016ef0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Hazard.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Hazard.java
@@ -23,35 +23,39 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hazard</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Hazard represents a condition or state in the system that may contribute to accidents. It is usually a failure of some kind, but may also be a result of nominal operation. 
- * The Hazard does not address hazards as electric shock, fire, smoke, heat, radiation, toxicity, flammability, reactivity, corrosion, release of energy, and similar hazards unless directly caused by malfunctioning behaviour of E/E safety related systems..
- * The Hazard metaclass is contained in the context, as Hazard specializes ADLTraceableSpecification. The context describes the element of the system where this hazard occur.
+ * The Hazard represents a condition or state in the system that may contribute to accidents. It is usually a failure of some kind, but may also be a
+ * result of nominal operation.
+ * The Hazard does not address hazards as electric shock, fire, smoke, heat, radiation, toxicity, flammability, reactivity, corrosion, release of
+ * energy, and similar hazards unless directly caused by malfunctioning behaviour of E/E safety related systems..
+ * The Hazard metaclass is contained in the context, as Hazard specializes ADLTraceableSpecification. The context describes the element of the system
+ * where this hazard occur.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getMalfunction <em>Malfunction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getMalfunction <em>Malfunction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getItem <em>Item</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazard()
  * @model
  * @generated
  */
 public interface Hazard extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazard_Base_Class()
@@ -64,7 +68,9 @@ public interface Hazard extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.Hazard#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -75,10 +81,10 @@ public interface Hazard extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.Item}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Item</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Item</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Item</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazard_Item()
 	 * @model required="true" ordered="false"
@@ -91,10 +97,10 @@ public interface Hazard extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.FeatureFlaw}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Malfunction</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Malfunction</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Malfunction</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazard_Malfunction()
 	 * @model required="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/HazardousEvent.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/HazardousEvent.java
index 9437a09778f..e3a6eac19eb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/HazardousEvent.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/HazardousEvent.java
@@ -28,51 +28,55 @@ import org.eclipse.uml2.uml.UseCase;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hazardous Event</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The HazardousEvent metaclass represents a combination of a Hazard and a specific situation, the latter being characterized by operating mode and operational situation in terms of a particular use case, environment and traffic. 
+ * The HazardousEvent metaclass represents a combination of a Hazard and a specific situation, the latter being characterized by operating mode and
+ * operational situation in terms of a particular use case, environment and traffic.
  * 
  * Semantics:
- * The HazardousEvent denotes a combination of a Hazard and an operational situation. The controllability and severity attributes shall be consistent with the operational situation and operational scenario, and the Exposure shall reflect the likelihood of the operational situation and scenario.
+ * The HazardousEvent denotes a combination of a Hazard and an operational situation. The controllability and severity attributes shall be consistent
+ * with the operational situation and operational scenario, and the Exposure shall reflect the likelihood of the operational situation and scenario.
  * 
  * Notation:
- * The Hazard is shown as a solid-outline rectangle with "Haz" at the top right. It contains the name of the Hazard and optionally the name of the source entity.
+ * The Hazard is shown as a solid-outline rectangle with "Haz" at the top right. It contains the name of the Hazard and optionally the name of the
+ * source entity.
  * 
- * Extension: 
+ * Extension:
  * UML::Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability <em>Controllability</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExposure <em>Exposure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification <em>Hazard Classification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions <em>Classification Assumptions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazard <em>Hazard</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getTraffic <em>Traffic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getEnvironment <em>Environment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperationalSituationUseCase <em>Operational Situation Use Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperatingMode <em>Operating Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExternalMeasures <em>External Measures</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability <em>Controllability</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExposure <em>Exposure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification <em>Hazard Classification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getSeverity <em>Severity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions <em>Classification Assumptions</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazard <em>Hazard</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getTraffic <em>Traffic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getEnvironment <em>Environment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperationalSituationUseCase <em>Operational Situation Use Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getOperatingMode <em>Operating Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExternalMeasures <em>External Measures</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent()
  * @model
  * @generated
  */
 public interface HazardousEvent extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_Base_Class()
@@ -85,7 +89,9 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -95,10 +101,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Classification Assumptions</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Classification Assumptions</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Classification Assumptions</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Classification Assumptions</em>' attribute.
 	 * @see #setClassificationAssumptions(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_ClassificationAssumptions()
@@ -112,10 +118,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Controllability</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Controllability</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Controllability</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
 	 * @see #setControllability(ControllabilityClassKind)
@@ -130,10 +136,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Environment</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Environment</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Environment</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_Environment()
 	 * @model ordered="false"
@@ -146,10 +152,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.ExposureClassKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Exposure</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Exposure</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Exposure</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ExposureClassKind
 	 * @see #setExposure(ExposureClassKind)
@@ -164,10 +170,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>External Measures</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>External Measures</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>External Measures</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_ExternalMeasures()
 	 * @model ordered="false"
@@ -180,10 +186,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.Hazard}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hazard</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hazard</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hazard</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_Hazard()
 	 * @model required="true" ordered="false"
@@ -196,10 +202,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hazard Classification</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hazard Classification</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hazard Classification</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #setHazardClassification(ASILKind)
@@ -210,10 +216,13 @@ public interface HazardousEvent extends TraceableSpecification {
 	ASILKind getHazardClassification();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification <em>Hazard Classification</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getHazardClassification <em>Hazard Classification</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hazard Classification</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Hazard Classification</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #getHazardClassification()
 	 * @generated
@@ -225,10 +234,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Operating Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Operating Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Operating Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_OperatingMode()
 	 * @model ordered="false"
@@ -241,10 +250,11 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.UseCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Operational Situation Use Case</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Operational Situation Use Case</em>' reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Operational Situation Use Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_OperationalSituationUseCase()
 	 * @model required="true" ordered="false"
@@ -257,10 +267,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.SeverityClassKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Severity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Severity</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Severity</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.SeverityClassKind
 	 * @see #setSeverity(SeverityClassKind)
@@ -275,10 +285,10 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Traffic</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Traffic</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Traffic</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getHazardousEvent_Traffic()
 	 * @model ordered="false"
@@ -287,10 +297,13 @@ public interface HazardousEvent extends TraceableSpecification {
 	EList<OperationalSituation> getTraffic();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions <em>Classification Assumptions</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getClassificationAssumptions
+	 * <em>Classification Assumptions</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Classification Assumptions</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Classification Assumptions</em>' attribute.
 	 * @see #getClassificationAssumptions()
 	 * @generated
 	 */
@@ -300,7 +313,9 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getControllability <em>Controllability</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Controllability</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Controllability</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind
 	 * @see #getControllability()
 	 * @generated
@@ -311,7 +326,9 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getExposure <em>Exposure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exposure</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Exposure</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.ExposureClassKind
 	 * @see #getExposure()
 	 * @generated
@@ -322,7 +339,9 @@ public interface HazardousEvent extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent#getSeverity <em>Severity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Severity</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Severity</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.SeverityClassKind
 	 * @see #getSeverity()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Item.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Item.java
index e7a7e7c38b4..3501e65282e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Item.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/Item.java
@@ -24,9 +24,10 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeatu
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Item</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Item entity identifies the scope of safety information and the safety assessment, i.e. the part of the system onto which the ISO26262 related information applies. Safety analyses are carried out on the basis of an item definition and the safety concepts are derived from it.
+ * The Item entity identifies the scope of safety information and the safety assessment, i.e. the part of the system onto which the ISO26262 related
+ * information applies. Safety analyses are carried out on the basis of an item definition and the safety concepts are derived from it.
  * 
  * Semantics:
  * Item represents the scope of safety information and the safety assessment trough its reference to one or several Features.
@@ -34,29 +35,30 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeatu
  * Extension:
  * UML::Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory <em>Development Category</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getVehicleFeature <em>Vehicle Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory <em>Development Category</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.Item#getVehicleFeature <em>Vehicle Feature</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getItem()
  * @model
  * @generated
  */
 public interface Item extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getItem_Base_Class()
@@ -69,7 +71,9 @@ public interface Item extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.Item#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -83,6 +87,7 @@ public interface Item extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * It shall be determined whether the item is a modification of an existing item or if it is a new development.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Development Category</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
 	 * @see #setDevelopmentCategory(DevelopmentCategoryKind)
@@ -97,10 +102,10 @@ public interface Item extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vehicle Feature</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vehicle Feature</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vehicle Feature</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getItem_VehicleFeature()
 	 * @model required="true" ordered="false"
@@ -112,7 +117,9 @@ public interface Item extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.Item#getDevelopmentCategory <em>Development Category</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Development Category</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Development Category</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.DevelopmentCategoryKind
 	 * @see #getDevelopmentCategory()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/SeverityClassKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/SeverityClassKind.java
index 93845f0a370..91593663047 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/SeverityClassKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/SeverityClassKind.java
@@ -27,14 +27,16 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The SeverityClassKind is an enumeration metaclass with enumeration literals indicating the severity attributes S0, S1, S2 or S3 in accordance with ISO26262.
+ * The SeverityClassKind is an enumeration metaclass with enumeration literals indicating the severity attributes S0, S1, S2 or S3 in accordance with
+ * ISO26262.
  * 
  * Semantics:
  * The semantics is defined at each enumeration literal and fully defined in the ISO26262 standard.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#getSeverityClassKind()
  * @model
  * @generated
@@ -44,6 +46,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * The '<em><b>S0</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #S0_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * The '<em><b>S1</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #S1_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +68,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * The '<em><b>S2</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #S2_VALUE
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * The '<em><b>S3</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #S3_VALUE
 	 * @generated
 	 * @ordered
@@ -87,6 +93,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * No injuries.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #S0
 	 * @model
 	 * @generated
@@ -101,6 +108,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Light and moderate injuries
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #S1
 	 * @model
 	 * @generated
@@ -115,6 +123,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Severe and life-threatening injuries (survival probable)
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #S2
 	 * @model
 	 * @generated
@@ -129,6 +138,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Life-threatening injuries (survival uncertain), fatal injuries
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #S3
 	 * @model
 	 * @generated
@@ -140,20 +150,16 @@ public enum SeverityClassKind implements Enumerator {
 	 * An array of all the '<em><b>Severity Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final SeverityClassKind[] VALUES_ARRAY =
-		new SeverityClassKind[] {
-			S0,
-			S1,
-			S2,
-			S3,
-		};
+	private static final SeverityClassKind[] VALUES_ARRAY = new SeverityClassKind[]{ S0, S1, S2, S3, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Severity Class Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<SeverityClassKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -162,14 +168,19 @@ public enum SeverityClassKind implements Enumerator {
 	 * Returns the '<em><b>Severity Class Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SeverityClassKind get(int value) {
-		switch (value) {
-			case S0_VALUE: return S0;
-			case S1_VALUE: return S1;
-			case S2_VALUE: return S2;
-			case S3_VALUE: return S3;
+		switch(value) {
+		case S0_VALUE:
+			return S0;
+		case S1_VALUE:
+			return S1;
+		case S2_VALUE:
+			return S2;
+		case S3_VALUE:
+			return S3;
 		}
 		return null;
 	}
@@ -178,12 +189,13 @@ public enum SeverityClassKind implements Enumerator {
 	 * Returns the '<em><b>Severity Class Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SeverityClassKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			SeverityClassKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -194,12 +206,13 @@ public enum SeverityClassKind implements Enumerator {
 	 * Returns the '<em><b>Severity Class Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SeverityClassKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			SeverityClassKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -209,6 +222,7 @@ public enum SeverityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -216,6 +230,7 @@ public enum SeverityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -223,6 +238,7 @@ public enum SeverityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -231,6 +247,7 @@ public enum SeverityClassKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private SeverityClassKind(int value, String name, String literal) {
@@ -242,39 +259,43 @@ public enum SeverityClassKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //SeverityClassKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/Anomaly.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/Anomaly.java
index 1bf18cc3430..dcfa10dace3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/Anomaly.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/Anomaly.java
@@ -25,9 +25,11 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Anomaly</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Anomaly metaclass represents a Fault that may occur internally in an ErrorModel or being propagated to it, or a failure that is propagated out of an Error Model. The anomaly may represent different faults or failures depending on the range of its EADatatype. Typically, the EADatatype is an Enumeration, for example:
+ * The Anomaly metaclass represents a Fault that may occur internally in an ErrorModel or being propagated to it, or a failure that is propagated out
+ * of an Error Model. The anomaly may represent different faults or failures depending on the range of its EADatatype. Typically, the EADatatype is an
+ * Enumeration, for example:
  * 
  * BrakeAnomaly:
  * - BrakePressureTooLow
@@ -37,38 +39,43 @@ import org.eclipse.uml2.uml.Property;
  * - Comission
  * Semantics="brake pressure exceeds requested value with more than 10% of maximal brake pressure"
  * 
- * Semantics may also be a more formal expression defining in the type of the nominal datatype what value range is considered a fault. This depends on the user and tooling available.
+ * Semantics may also be a more formal expression defining in the type of the nominal datatype what value range is considered a fault. This depends on
+ * the user and tooling available.
  * 
  * Semantics:
- * An anomaly refers to a condition that deviates from expectations based on requirements specifications, design documents, user documents, standards, etc., or from someone's perceptions or experiences (ISO26262). The set of available faults or failures represented by the Anomaly is defined by its EADatatype, typically an enumeration type like {omission, commission}. It is an abstract class further specialized with metaclasses for different types of fault/failure.
+ * An anomaly refers to a condition that deviates from expectations based on requirements specifications, design documents, user documents, standards,
+ * etc., or from someone's perceptions or experiences (ISO26262). The set of available faults or failures represented by the Anomaly is defined by its
+ * EADatatype, typically an enumeration type like {omission, commission}. It is an abstract class further specialized with metaclasses for different
+ * types of fault/failure.
  * 
  * 
  * Extension:
  * (UML::Part)
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription <em>Generic Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription <em>Generic Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getAnomaly()
  * @model
  * @generated
  */
 public interface Anomaly extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Generic Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Generic Description</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generic Description</em>' attribute.
 	 * @see #setGenericDescription(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getAnomaly_GenericDescription()
@@ -81,10 +88,10 @@ public interface Anomaly extends EAElement {
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(EADatatype)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getAnomaly_Type()
@@ -97,17 +104,22 @@ public interface Anomaly extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Type</em>' reference.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(EADatatype value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription <em>Generic Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription <em>Generic Description</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generic Description</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Generic Description</em>' attribute.
 	 * @see #getGenericDescription()
 	 * @generated
 	 */
@@ -117,10 +129,10 @@ public interface Anomaly extends EAElement {
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getAnomaly_Base_Property()
@@ -133,7 +145,9 @@ public interface Anomaly extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehavior.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehavior.java
index 68acd13b8ed..42dc948099e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehavior.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehavior.java
@@ -24,48 +24,53 @@ import org.eclipse.uml2.uml.Behavior;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Error Behavior</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ErrorBehavior represents the descriptions of failure logics or semantics that the target element identified by the ErrorModelType exhibits. Typically the target is a system, a function, a software component, or a hardware device.
- * Each ErrorBehavior description relates the occurrences of internal faults and incoming external faults to failures. The faults and failures that the errorBehavior propagated to and from the target element are declared through the ports of the error model.
+ * ErrorBehavior represents the descriptions of failure logics or semantics that the target element identified by the ErrorModelType exhibits.
+ * Typically the target is a system, a function, a software component, or a hardware device.
+ * Each ErrorBehavior description relates the occurrences of internal faults and incoming external faults to failures. The faults and failures that
+ * the errorBehavior propagated to and from the target element are declared through the ports of the error model.
  * 
- * Semantics: 
+ * Semantics:
  * ErrorBehavior defines the error propagation logic of its containing ErrorModelType.
- * The ErrorBehavior description represents the error propagations from internal faults or incoming faults to external failures. Faults are identified by the internalFault and externalFault associations respectively. The propagated failures are identified by the externalFailure association. 
- * The ErrorBehavior is defined in the failureLogic string, either directly or as a url referencing an external specification. 
- * The failureLogic can be based on different formalisms, depending on the analysis techniques and tools available. This is indicated by its type:ErrorBehaviorKind attribute. The failureLogic attribute contains the actual failure propagation logic. 
+ * The ErrorBehavior description represents the error propagations from internal faults or incoming faults to external failures. Faults are identified
+ * by the internalFault and externalFault associations respectively. The propagated failures are identified by the externalFailure association.
+ * The ErrorBehavior is defined in the failureLogic string, either directly or as a url referencing an external specification.
+ * The failureLogic can be based on different formalisms, depending on the analysis techniques and tools available. This is indicated by its
+ * type:ErrorBehaviorKind attribute. The failureLogic attribute contains the actual failure propagation logic.
  * 
  * Extension:
  * UML:Behavior
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior <em>Base Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic <em>Failure Logic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getInternalFault <em>Internal Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFailure <em>External Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFault <em>External Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getProcessFault <em>Process Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior <em>Base Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic <em>Failure Logic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getInternalFault <em>Internal Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner <em>Owner</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFailure <em>External Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFault <em>External Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getProcessFault <em>Process Fault</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior()
  * @model
  * @generated
  */
 public interface ErrorBehavior extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Behavior</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Behavior</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Behavior</em>' reference.
 	 * @see #setBase_Behavior(Behavior)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_Base_Behavior()
@@ -75,10 +80,13 @@ public interface ErrorBehavior extends EAElement {
 	Behavior getBase_Behavior();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior <em>Base Behavior</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior <em>Base Behavior</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Behavior</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Behavior</em>' reference.
 	 * @see #getBase_Behavior()
 	 * @generated
 	 */
@@ -89,10 +97,10 @@ public interface ErrorBehavior extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>External Failure</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>External Failure</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>External Failure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_ExternalFailure()
 	 * @model required="true" ordered="false"
@@ -105,10 +113,10 @@ public interface ErrorBehavior extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>External Fault</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>External Fault</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>External Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_ExternalFault()
 	 * @model ordered="false"
@@ -121,8 +129,10 @@ public interface ErrorBehavior extends EAElement {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The error logic description based on an external formalism or the path to the file or model entity containing the external error logic description.
+	 * The error logic description based on an external formalism or the path to the file or model entity containing the external error logic
+	 * description.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Failure Logic</em>' attribute.
 	 * @see #setFailureLogic(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_FailureLogic()
@@ -132,10 +142,13 @@ public interface ErrorBehavior extends EAElement {
 	String getFailureLogic();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic <em>Failure Logic</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic <em>Failure Logic</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Failure Logic</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Failure Logic</em>' attribute.
 	 * @see #getFailureLogic()
 	 * @generated
 	 */
@@ -149,6 +162,7 @@ public interface ErrorBehavior extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The occurrences of internal faults.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Internal Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_InternalFault()
 	 * @model ordered="false"
@@ -158,13 +172,14 @@ public interface ErrorBehavior extends EAElement {
 
 	/**
 	 * Returns the value of the '<em><b>Owner</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}'.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Owner</em>' container reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Owner</em>' container reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Owner</em>' reference.
 	 * @see #setOwner(ErrorModelType)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_Owner()
@@ -179,10 +194,10 @@ public interface ErrorBehavior extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Process Fault</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Process Fault</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Process Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehavior_ProcessFault()
 	 * @model ordered="false"
@@ -198,6 +213,7 @@ public interface ErrorBehavior extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The type of formalism applied for the error behavior description.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
 	 * @see #setType(ErrorBehaviorKind)
@@ -211,7 +227,9 @@ public interface ErrorBehavior extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner <em>Owner</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owner</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Owner</em>' reference.
 	 * @see #getOwner()
 	 * @generated
 	 */
@@ -221,7 +239,9 @@ public interface ErrorBehavior extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
 	 * @see #getType()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehaviorKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehaviorKind.java
index 4dbe33970b7..86ce2b2f44f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehaviorKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorBehaviorKind.java
@@ -30,11 +30,12 @@ import org.eclipse.emf.common.util.Enumerator;
  * The ErrorBehaviorKind metaclass represents an enumeration of literals describing various types of formalisms used for specifying error behavior.
  * 
  * Semantics:
- * ErrorBehaviorKind represents different formalisms for ErrorBehavior. The semantics is defined at each enumeration literal. 
+ * ErrorBehaviorKind represents different formalisms for ErrorBehavior. The semantics is defined at each enumeration literal.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorBehaviorKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>HIP HOPS</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #HIP_HOPS_VALUE
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>ALTARICA</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALTARICA_VALUE
 	 * @generated
 	 * @ordered
@@ -62,6 +65,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>AADL</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #AADL_VALUE
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>OTHER</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER_VALUE
 	 * @generated
 	 * @ordered
@@ -82,10 +87,10 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>HIP HOPS</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>HIP HOPS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>HIP HOPS</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #HIP_HOPS
 	 * @model
 	 * @generated
@@ -97,10 +102,10 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>ALTARICA</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>ALTARICA</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>ALTARICA</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALTARICA
 	 * @model
 	 * @generated
@@ -112,10 +117,10 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>AADL</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>AADL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>AADL</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #AADL
 	 * @model
 	 * @generated
@@ -127,10 +132,10 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * The '<em><b>OTHER</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER
 	 * @model
 	 * @generated
@@ -142,20 +147,16 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * An array of all the '<em><b>Error Behavior Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ErrorBehaviorKind[] VALUES_ARRAY =
-		new ErrorBehaviorKind[] {
-			HIP_HOPS,
-			ALTARICA,
-			AADL,
-			OTHER,
-		};
+	private static final ErrorBehaviorKind[] VALUES_ARRAY = new ErrorBehaviorKind[]{ HIP_HOPS, ALTARICA, AADL, OTHER, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Error Behavior Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ErrorBehaviorKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -164,14 +165,19 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Error Behavior Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ErrorBehaviorKind get(int value) {
-		switch (value) {
-			case HIP_HOPS_VALUE: return HIP_HOPS;
-			case ALTARICA_VALUE: return ALTARICA;
-			case AADL_VALUE: return AADL;
-			case OTHER_VALUE: return OTHER;
+		switch(value) {
+		case HIP_HOPS_VALUE:
+			return HIP_HOPS;
+		case ALTARICA_VALUE:
+			return ALTARICA;
+		case AADL_VALUE:
+			return AADL;
+		case OTHER_VALUE:
+			return OTHER;
 		}
 		return null;
 	}
@@ -180,12 +186,13 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Error Behavior Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ErrorBehaviorKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ErrorBehaviorKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -196,12 +203,13 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * Returns the '<em><b>Error Behavior Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ErrorBehaviorKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ErrorBehaviorKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -211,6 +219,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -218,6 +227,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -225,6 +235,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -233,6 +244,7 @@ public enum ErrorBehaviorKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ErrorBehaviorKind(int value, String name, String literal) {
@@ -244,39 +256,43 @@ public enum ErrorBehaviorKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //ErrorBehaviorKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelPrototype.java
index 938a00f0da2..0c17c00eb57 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelPrototype.java
@@ -27,11 +27,15 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Error Model Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ErrorModelType and ErrorModelPrototype support the hierarchical composition of error models based on the type-prototype pattern also adopted for the nominal architecture composition. The purpose of the error models is to represent information relating to the anomalies of a nominal model element. 
+ * ErrorModelType and ErrorModelPrototype support the hierarchical composition of error models based on the type-prototype pattern also adopted for
+ * the nominal architecture composition. The purpose of the error models is to represent information relating to the anomalies of a nominal model
+ * element.
  * 
- * The ErrorModelPrototype is used to define hierarchical error models allowing additional detail or structure to the error model of a particular target. A hierarchal structure can also be defined when several ErrorModels are integrated to a larger ErrorModel representing a system integrated from several targets. 
+ * The ErrorModelPrototype is used to define hierarchical error models allowing additional detail or structure to the error model of a particular
+ * target. A hierarchal structure can also be defined when several ErrorModels are integrated to a larger ErrorModel representing a system integrated
+ * from several targets.
  * 
  * Typically the target is a system/subsystem, a function, a software component, or a hardware device.
  * 
@@ -42,33 +46,34 @@ import org.eclipse.uml2.uml.Property;
  * Extension:
  * (See ADLFunctionPrototype)
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget <em>Function Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget_path <em>Function Target path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget_path <em>Hw Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget <em>Function Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget_path <em>Function Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget_path <em>Hw Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype()
  * @model
  * @generated
  */
 public interface ErrorModelPrototype extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_Base_Property()
@@ -78,10 +83,13 @@ public interface ErrorModelPrototype extends EAElement {
 	Property getBase_Property();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property <em>Base Property</em>}
+	 * ' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
@@ -92,10 +100,10 @@ public interface ErrorModelPrototype extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_FunctionTarget()
 	 * @model ordered="false"
@@ -108,10 +116,10 @@ public interface ErrorModelPrototype extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hw Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_HwTarget()
 	 * @model ordered="false"
@@ -124,10 +132,10 @@ public interface ErrorModelPrototype extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Target path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Target path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Target path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_FunctionTarget_path()
 	 * @model
@@ -140,10 +148,10 @@ public interface ErrorModelPrototype extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hw Target path</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hw Target path</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hw Target path</em>' containment reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_HwTarget_path()
 	 * @model containment="true"
@@ -155,10 +163,10 @@ public interface ErrorModelPrototype extends EAElement {
 	 * Returns the value of the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #setTarget(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_Target()
@@ -174,6 +182,7 @@ public interface ErrorModelPrototype extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * {derived from UML::TypedElement::type}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelPrototype_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -185,7 +194,9 @@ public interface ErrorModelPrototype extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget <em>Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target</em>' reference.
 	 * @see #getTarget()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelType.java
index a3d996cd684..58124b24684 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrorModelType.java
@@ -25,71 +25,80 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentT
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Error Model Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ErrorModelType and ErrorModelPrototype support the hierarchical composition of error models based on the type-prototype pattern also adopted for the nominal architecture composition. The purpose of the error models is to represent information relating to the anomalies of a nominal model element. 
+ * ErrorModelType and ErrorModelPrototype support the hierarchical composition of error models based on the type-prototype pattern also adopted for
+ * the nominal architecture composition. The purpose of the error models is to represent information relating to the anomalies of a nominal model
+ * element.
  * 
- * An ErrorModelType represents the internal faults and fault propagations of the nominal element that it targets. 
+ * An ErrorModelType represents the internal faults and fault propagations of the nominal element that it targets.
  * 
  * Typically the target is a system/subsystem, a function, a software component, or a hardware device.
  * 
- * ErrorModelType inherits the abstract metaclass TraceableSpecification, allowing the ErrorModelType to be referenced from its design context in a similar way as requirements, test cases and other specifications. 
+ * ErrorModelType inherits the abstract metaclass TraceableSpecification, allowing the ErrorModelType to be referenced from its design context in a
+ * similar way as requirements, test cases and other specifications.
  * 
  * Constraints:
  * An ErrorModelType without part shall have one errorBehaviorDescription
  * 
  * Semantics:
- * The ErrorModelType represents a specification of the faults and fault propagations of its target element. 
+ * The ErrorModelType represents a specification of the faults and fault propagations of its target element.
  * 
  * Both types and prototypes may be targets, and the following cases are relevant:
- * - One nominal type: 
- * The ErrorModelType represents the identified nominal type wherever this nominal type is instantiated. 
- * - Several nominal types: 
+ * - One nominal type:
+ * The ErrorModelType represents the identified nominal type wherever this nominal type is instantiated.
+ * - Several nominal types:
  * The ErrorModelType represents the identified nominal types individually, i.e. the same error model applies to all nominal types and is reused.
- * - One nominal prototype: 
- * The ErrorModelType represents the identified nominal prototype whenever its context, i.e. its top-level composition is instantiated. 
- * - Several nominal prototypes with instanceref: 
- * The ErrorModelType represents the identified set of nominal prototypes (together) whenever their context, i.e. their top-level composition is instantiated. 
+ * - One nominal prototype:
+ * The ErrorModelType represents the identified nominal prototype whenever its context, i.e. its top-level composition is instantiated.
+ * - Several nominal prototypes with instanceref:
+ * The ErrorModelType represents the identified set of nominal prototypes (together) whenever their context, i.e. their top-level composition is
+ * instantiated.
  * 
- * The fault propagation of an errorModelType is defined by its contained parts, the ErrorModelPrototypes and their connections. In case it contains both parts and an errorBehaviorDescription, the errorBehaviorDescription shall be consistent with the parts.
- * FaultFailurePropagationLinks define valid propagation paths in the ErrorModelType. In case the contained FaultInPorts and FailureOutPorts reference nominal ports, the connectivity of the nominal model may serve as a pattern for connecting ports in the ErrorModelType. 
- * The ErrorModelType contains internalFaults and externalFaults, representing faults that are either propagated to externalFailures or masked, according to the definition of its fault propagation.
- * A processFault represents a flaw introduced during design, and may lead to any of the failures represented by the ErrorModelType. A processFault thus has a direct propagation to all externalFailures and cannot be masked. 
+ * The fault propagation of an errorModelType is defined by its contained parts, the ErrorModelPrototypes and their connections. In case it contains
+ * both parts and an errorBehaviorDescription, the errorBehaviorDescription shall be consistent with the parts.
+ * FaultFailurePropagationLinks define valid propagation paths in the ErrorModelType. In case the contained FaultInPorts and FailureOutPorts reference
+ * nominal ports, the connectivity of the nominal model may serve as a pattern for connecting ports in the ErrorModelType.
+ * The ErrorModelType contains internalFaults and externalFaults, representing faults that are either propagated to externalFailures or masked,
+ * according to the definition of its fault propagation.
+ * A processFault represents a flaw introduced during design, and may lead to any of the failures represented by the ErrorModelType. A processFault
+ * thus has a direct propagation to all externalFailures and cannot be masked.
  * 
  * Extension:
  * (see ADLTraceableSpecfication)
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription <em>Generic Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFaultFailureConnector <em>Fault Failure Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getPart <em>Part</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFailure <em>Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getExternalFault <em>External Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getInternalFault <em>Internal Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getProcessFault <em>Process Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription <em>Generic Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFaultFailureConnector <em>Fault Failure Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFailure <em>Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getExternalFault <em>External Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getInternalFault <em>Internal Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getProcessFault <em>Process Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType()
  * @model
  * @generated
  */
 public interface ErrorModelType extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_Base_Class()
@@ -99,10 +108,13 @@ public interface ErrorModelType extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -114,10 +126,11 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner <em>Owner</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Error Behavior Description</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Error Behavior Description</em>' containment reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Error Behavior Description</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_ErrorBehaviorDescription()
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner
@@ -131,10 +144,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>External Fault</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>External Fault</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>External Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_ExternalFault()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -147,10 +160,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Failure</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Failure</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Failure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_Failure()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -167,6 +180,7 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The links for the error propagations between subordinate error models.
 	 * {derived from UML::StructuredClassifier::ownedConnector}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Fault Failure Connector</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_FaultFailureConnector()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -179,10 +193,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The default value is <code>"NA"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Generic Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Generic Description</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generic Description</em>' attribute.
 	 * @see #setGenericDescription(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_GenericDescription()
@@ -196,10 +210,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hw Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_HwTarget()
 	 * @model ordered="false"
@@ -212,10 +226,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Internal Fault</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Internal Fault</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Internal Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_InternalFault()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -231,6 +245,7 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * {derived from UML::Classifier::attribute}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Part</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_Part()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -243,10 +258,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Process Fault</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Process Fault</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Process Fault</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_ProcessFault()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -259,10 +274,10 @@ public interface ErrorModelType extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getErrorModelType_Target()
 	 * @model ordered="false"
@@ -271,10 +286,13 @@ public interface ErrorModelType extends TraceableSpecification {
 	EList<FunctionType> getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription <em>Generic Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription
+	 * <em>Generic Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generic Description</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Generic Description</em>' attribute.
 	 * @see #getGenericDescription()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelFactory.java
index cec0c2fdd12..59bcf53a15c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage
  * @generated
  */
 public interface ErrormodelFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ErrormodelFactory eINSTANCE = org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Anomaly</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Anomaly</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Error Behavior</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Behavior</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Error Model Prototype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Model Prototype</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Error Model Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Model Type</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Failure Out Port</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Failure Out Port</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Fault Failure Propagation Link</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Fault Failure Propagation Link</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Fault In Port</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Fault In Port</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Internal Fault Prototype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Internal Fault Prototype</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns a new object of class '<em>Process Fault Prototype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Process Fault Prototype</em>'.
 	 * @generated
 	 */
@@ -119,6 +131,7 @@ public interface ErrormodelFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelPackage.java
index 88a6127db82..cd59cac949d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ErrormodelPackage.java
@@ -28,39 +28,51 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The EAST-ADL2 sub-package for error modeling provides support for safety engineering by representing possible, incorrect behaviors of a system in its operation (e.g., component errors and their propagations).
- * Abnormal behaviors of architectural elements as well as their instantiations in a particular product context can be represented, forming a basis for safety analysis through external techniques and tools. Through the integration with other language constructs, definitions of error behaviors and hazards can be traced to the specifications of safety requirements, and further to the subsequent functional and non-functional requirements on error handing and hazard mitigations as well as to the necessary V&V efforts. 
- * Error behaviors are treated as a separated view, orthogonal to the nominal architecture model. This separation of concern in modeling is considered necessary in order to avoid some undesired effects of error modeling, such as the risk of mixing nominal and erroneous behavior in regards to the comprehension, reuse, and system synthesis (e.g., code generation).
+ * The EAST-ADL2 sub-package for error modeling provides support for safety engineering by representing possible, incorrect behaviors of a system in
+ * its operation (e.g., component errors and their propagations).
+ * Abnormal behaviors of architectural elements as well as their instantiations in a particular product context can be represented, forming a basis
+ * for safety analysis through external techniques and tools. Through the integration with other language constructs, definitions of error behaviors
+ * and hazards can be traced to the specifications of safety requirements, and further to the subsequent functional and non-functional requirements on
+ * error handing and hazard mitigations as well as to the necessary V&V efforts.
+ * Error behaviors are treated as a separated view, orthogonal to the nominal architecture model. This separation of concern in modeling is considered
+ * necessary in order to avoid some undesired effects of error modeling, such as the risk of mixing nominal and erroneous behavior in regards to the
+ * comprehension, reuse, and system synthesis (e.g., code generation).
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelFactory
  * @model kind="package"
  * @generated
  */
 public interface ErrormodelPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl <em>Error Behavior</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl
+		 * <em>Error Behavior</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorBehavior()
 		 * @generated
@@ -71,6 +83,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__BASE_BEHAVIOR = eINSTANCE.getErrorBehavior_Base_Behavior();
@@ -79,6 +92,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Failure Logic</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BEHAVIOR__FAILURE_LOGIC = eINSTANCE.getErrorBehavior_FailureLogic();
@@ -87,6 +101,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BEHAVIOR__TYPE = eINSTANCE.getErrorBehavior_Type();
@@ -95,6 +110,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Internal Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__INTERNAL_FAULT = eINSTANCE.getErrorBehavior_InternalFault();
@@ -103,6 +119,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__OWNER = eINSTANCE.getErrorBehavior_Owner();
@@ -111,6 +128,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>External Failure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__EXTERNAL_FAILURE = eINSTANCE.getErrorBehavior_ExternalFailure();
@@ -119,6 +137,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>External Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__EXTERNAL_FAULT = eINSTANCE.getErrorBehavior_ExternalFault();
@@ -127,6 +146,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Process Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_BEHAVIOR__PROCESS_FAULT = eINSTANCE.getErrorBehavior_ProcessFault();
@@ -135,6 +155,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl <em>Anomaly</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getAnomaly()
 		 * @generated
@@ -145,6 +166,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Generic Description</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANOMALY__GENERIC_DESCRIPTION = eINSTANCE.getAnomaly_GenericDescription();
@@ -153,6 +175,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANOMALY__BASE_PROPERTY = eINSTANCE.getAnomaly_Base_Property();
@@ -161,14 +184,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANOMALY__TYPE = eINSTANCE.getAnomaly_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl <em>Internal Fault Prototype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl
+		 * <em>Internal Fault Prototype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getInternalFaultPrototype()
 		 * @generated
@@ -179,6 +205,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference INTERNAL_FAULT_PROTOTYPE__BASE_CLASS = eINSTANCE.getInternalFaultPrototype_Base_Class();
@@ -187,14 +214,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Event</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference INTERNAL_FAULT_PROTOTYPE__BASE_EVENT = eINSTANCE.getInternalFaultPrototype_Base_Event();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl <em>Error Model Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl
+		 * <em>Error Model Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorModelType()
 		 * @generated
@@ -205,6 +235,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__BASE_CLASS = eINSTANCE.getErrorModelType_Base_Class();
@@ -213,6 +244,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Generic Description</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODEL_TYPE__GENERIC_DESCRIPTION = eINSTANCE.getErrorModelType_GenericDescription();
@@ -221,6 +253,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Fault Failure Connector</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__FAULT_FAILURE_CONNECTOR = eINSTANCE.getErrorModelType_FaultFailureConnector();
@@ -229,6 +262,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Part</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__PART = eINSTANCE.getErrorModelType_Part();
@@ -237,6 +271,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Failure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__FAILURE = eINSTANCE.getErrorModelType_Failure();
@@ -245,6 +280,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>External Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__EXTERNAL_FAULT = eINSTANCE.getErrorModelType_ExternalFault();
@@ -253,6 +289,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Internal Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__INTERNAL_FAULT = eINSTANCE.getErrorModelType_InternalFault();
@@ -261,6 +298,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Process Fault</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__PROCESS_FAULT = eINSTANCE.getErrorModelType_ProcessFault();
@@ -269,6 +307,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__TARGET = eINSTANCE.getErrorModelType_Target();
@@ -277,6 +316,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hw Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__HW_TARGET = eINSTANCE.getErrorModelType_HwTarget();
@@ -285,14 +325,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Error Behavior Description</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION = eINSTANCE.getErrorModelType_ErrorBehaviorDescription();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl <em>Fault Failure Propagation Link</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl
+		 * <em>Fault Failure Propagation Link</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultFailurePropagationLink()
 		 * @generated
@@ -303,6 +346,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR = eINSTANCE.getFaultFailurePropagationLink_Base_Connector();
@@ -311,6 +355,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Immediate Propagation</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION = eINSTANCE.getFaultFailurePropagationLink_ImmediatePropagation();
@@ -319,6 +364,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>To Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PROPAGATION_LINK__TO_PORT = eINSTANCE.getFaultFailurePropagationLink_ToPort();
@@ -327,6 +373,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>From Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT = eINSTANCE.getFaultFailurePropagationLink_FromPort();
@@ -335,6 +382,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>From Port path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH = eINSTANCE.getFaultFailurePropagationLink_FromPort_path();
@@ -343,14 +391,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>To Port path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH = eINSTANCE.getFaultFailurePropagationLink_ToPort_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl <em>Fault Failure Port</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl
+		 * <em>Fault Failure Port</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultFailurePort()
 		 * @generated
@@ -361,6 +412,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PORT__BASE_PORT = eINSTANCE.getFaultFailurePort_Base_Port();
@@ -369,6 +421,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PORT__FUNCTION_TARGET = eINSTANCE.getFaultFailurePort_FunctionTarget();
@@ -377,6 +430,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hw Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PORT__HW_TARGET = eINSTANCE.getFaultFailurePort_HwTarget();
@@ -385,6 +439,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Target path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH = eINSTANCE.getFaultFailurePort_FunctionTarget_path();
@@ -393,14 +448,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hw Target path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE_PORT__HW_TARGET_PATH = eINSTANCE.getFaultFailurePort_HwTarget_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl <em>Error Model Prototype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl
+		 * <em>Error Model Prototype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorModelPrototype()
 		 * @generated
@@ -411,6 +469,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__BASE_PROPERTY = eINSTANCE.getErrorModelPrototype_Base_Property();
@@ -419,6 +478,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__TYPE = eINSTANCE.getErrorModelPrototype_Type();
@@ -427,6 +487,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__TARGET = eINSTANCE.getErrorModelPrototype_Target();
@@ -435,6 +496,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET = eINSTANCE.getErrorModelPrototype_FunctionTarget();
@@ -443,6 +505,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hw Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__HW_TARGET = eINSTANCE.getErrorModelPrototype_HwTarget();
@@ -451,6 +514,7 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Target path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH = eINSTANCE.getErrorModelPrototype_FunctionTarget_path();
@@ -459,14 +523,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hw Target path</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH = eINSTANCE.getErrorModelPrototype_HwTarget_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl <em>Process Fault Prototype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl
+		 * <em>Process Fault Prototype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getProcessFaultPrototype()
 		 * @generated
@@ -477,14 +544,17 @@ public interface ErrormodelPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Event</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROCESS_FAULT_PROTOTYPE__BASE_EVENT = eINSTANCE.getProcessFaultPrototype_Base_Event();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl <em>Failure Out Port</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl
+		 * <em>Failure Out Port</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFailureOutPort()
 		 * @generated
@@ -492,9 +562,11 @@ public interface ErrormodelPackage extends EPackage {
 		EClass FAILURE_OUT_PORT = eINSTANCE.getFailureOutPort();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultInPortImpl <em>Fault In Port</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultInPortImpl <em>Fault In Port</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultInPortImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultInPort()
 		 * @generated
@@ -502,9 +574,11 @@ public interface ErrormodelPackage extends EPackage {
 		EClass FAULT_IN_PORT = eINSTANCE.getFaultInPort();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind <em>Error Behavior Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
+		 * <em>Error Behavior Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorBehaviorKind()
 		 * @generated
@@ -517,6 +591,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "errormodel";
@@ -525,6 +600,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Dependability/ErrorModel/1";
@@ -533,6 +609,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "ErrorModel";
@@ -541,6 +618,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ErrormodelPackage eINSTANCE = org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl.init();
@@ -549,6 +627,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl <em>Error Behavior</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorBehavior()
 	 * @generated
@@ -559,6 +638,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -568,6 +648,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -577,15 +658,18 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BEHAVIOR__OWNED_COMMENT = ElementsPackage.EA_ELEMENT__OWNED_COMMENT;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl <em>Internal Fault Prototype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl
+	 * <em>Internal Fault Prototype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getInternalFaultPrototype()
 	 * @generated
@@ -593,9 +677,11 @@ public interface ErrormodelPackage extends EPackage {
 	int INTERNAL_FAULT_PROTOTYPE = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl <em>Error Model Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl <em>Error Model Type</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorModelType()
 	 * @generated
@@ -603,9 +689,11 @@ public interface ErrormodelPackage extends EPackage {
 	int ERROR_MODEL_TYPE = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl <em>Fault Failure Propagation Link</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl
+	 * <em>Fault Failure Propagation Link</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultFailurePropagationLink()
 	 * @generated
@@ -613,9 +701,11 @@ public interface ErrormodelPackage extends EPackage {
 	int FAULT_FAILURE_PROPAGATION_LINK = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl <em>Error Model Prototype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl
+	 * <em>Error Model Prototype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorModelPrototype()
 	 * @generated
@@ -623,9 +713,11 @@ public interface ErrormodelPackage extends EPackage {
 	int ERROR_MODEL_PROTOTYPE = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl <em>Failure Out Port</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl <em>Failure Out Port</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FailureOutPortImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFailureOutPort()
 	 * @generated
@@ -636,6 +728,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultInPortImpl <em>Fault In Port</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultInPortImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultInPort()
 	 * @generated
@@ -646,6 +739,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Behavior</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -655,6 +749,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Failure Logic</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -664,6 +759,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -673,6 +769,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Internal Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -682,6 +779,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -691,6 +789,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>External Failure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -700,6 +799,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>External Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -709,6 +809,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Process Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -718,6 +819,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Error Behavior</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -727,6 +829,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl <em>Anomaly</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getAnomaly()
 	 * @generated
@@ -737,6 +840,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -746,6 +850,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -755,6 +860,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -764,6 +870,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -773,6 +880,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -782,6 +890,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -791,6 +900,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Anomaly</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -800,6 +910,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -809,6 +920,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -818,6 +930,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -827,6 +940,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -836,6 +950,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -845,6 +960,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -854,6 +970,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -863,6 +980,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -872,6 +990,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Internal Fault Prototype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -881,6 +1000,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -890,6 +1010,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -899,6 +1020,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -908,6 +1030,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -917,6 +1040,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -926,6 +1050,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -935,6 +1060,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -944,6 +1070,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Fault Failure Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -953,6 +1080,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -962,6 +1090,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Failure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -971,6 +1100,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>External Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -980,6 +1110,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Internal Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -989,6 +1120,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Process Fault</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -998,6 +1130,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1007,6 +1140,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1016,6 +1150,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Error Behavior Description</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1025,6 +1160,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Error Model Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1034,6 +1170,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1043,6 +1180,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1052,6 +1190,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1061,6 +1200,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1070,6 +1210,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Immediate Propagation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1079,6 +1220,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>To Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1088,6 +1230,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>From Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1097,6 +1240,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>From Port path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1106,6 +1250,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>To Port path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1115,15 +1260,18 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Fault Failure Propagation Link</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FAULT_FAILURE_PROPAGATION_LINK_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl <em>Fault Failure Port</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl <em>Fault Failure Port</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getFaultFailurePort()
 	 * @generated
@@ -1134,6 +1282,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1143,6 +1292,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1152,6 +1302,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1161,6 +1312,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1170,6 +1322,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1179,6 +1332,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1188,6 +1342,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1197,6 +1352,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1206,6 +1362,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1215,6 +1372,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1224,6 +1382,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1233,15 +1392,18 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Fault Failure Port</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FAULT_FAILURE_PORT_FEATURE_COUNT = ANOMALY_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl <em>Process Fault Prototype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl
+	 * <em>Process Fault Prototype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getProcessFaultPrototype()
 	 * @generated
@@ -1252,6 +1414,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1261,6 +1424,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1270,6 +1434,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1279,6 +1444,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1288,6 +1454,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1297,6 +1464,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1306,6 +1474,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1315,6 +1484,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1324,6 +1494,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1333,6 +1504,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target path</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1342,6 +1514,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Error Model Prototype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1351,6 +1524,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1360,6 +1534,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1369,6 +1544,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1378,6 +1554,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1387,6 +1564,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1396,6 +1574,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1405,6 +1584,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1414,6 +1594,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1423,6 +1604,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1432,6 +1614,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1441,6 +1624,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1450,6 +1634,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Failure Out Port</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1459,6 +1644,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1468,6 +1654,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1477,6 +1664,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1486,6 +1674,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1495,6 +1684,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1504,6 +1694,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1513,6 +1704,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1522,6 +1714,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1531,6 +1724,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1540,6 +1734,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1549,6 +1744,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Hw Target path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1558,6 +1754,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Fault In Port</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1567,6 +1764,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1576,6 +1774,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1585,6 +1784,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1594,6 +1794,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1603,6 +1804,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1612,6 +1814,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1621,6 +1824,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1630,6 +1834,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The number of structural features of the '<em>Process Fault Prototype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1639,6 +1844,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind <em>Error Behavior Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrormodelPackageImpl#getErrorBehaviorKind()
 	 * @generated
@@ -1650,6 +1856,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly <em>Anomaly</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Anomaly</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly
 	 * @generated
@@ -1657,9 +1864,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getAnomaly();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription <em>Generic Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription
+	 * <em>Generic Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Generic Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getGenericDescription()
 	 * @see #getAnomaly()
@@ -1668,9 +1877,11 @@ public interface ErrormodelPackage extends EPackage {
 	EAttribute getAnomaly_GenericDescription();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property
+	 * <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getBase_Property()
 	 * @see #getAnomaly()
@@ -1682,6 +1893,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly#getType()
 	 * @see #getAnomaly()
@@ -1693,6 +1905,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior <em>Error Behavior</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Behavior</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior
 	 * @generated
@@ -1700,9 +1913,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getErrorBehavior();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior <em>Base Behavior</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior
+	 * <em>Base Behavior</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Behavior</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getBase_Behavior()
 	 * @see #getErrorBehavior()
@@ -1711,9 +1926,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorBehavior_Base_Behavior();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFailure <em>External Failure</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFailure
+	 * <em>External Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>External Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFailure()
 	 * @see #getErrorBehavior()
@@ -1722,9 +1939,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorBehavior_ExternalFailure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFault <em>External Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFault
+	 * <em>External Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>External Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getExternalFault()
 	 * @see #getErrorBehavior()
@@ -1733,9 +1952,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorBehavior_ExternalFault();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic <em>Failure Logic</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic
+	 * <em>Failure Logic</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Failure Logic</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getFailureLogic()
 	 * @see #getErrorBehavior()
@@ -1744,9 +1965,11 @@ public interface ErrormodelPackage extends EPackage {
 	EAttribute getErrorBehavior_FailureLogic();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getInternalFault <em>Internal Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getInternalFault
+	 * <em>Internal Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Internal Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getInternalFault()
 	 * @see #getErrorBehavior()
@@ -1758,6 +1981,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner <em>Owner</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Owner</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getOwner()
 	 * @see #getErrorBehavior()
@@ -1766,9 +1990,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorBehavior_Owner();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getProcessFault <em>Process Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getProcessFault
+	 * <em>Process Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Process Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getProcessFault()
 	 * @see #getErrorBehavior()
@@ -1780,6 +2006,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior#getType()
 	 * @see #getErrorBehavior()
@@ -1791,6 +2018,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind <em>Error Behavior Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Error Behavior Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind
 	 * @generated
@@ -1801,15 +2029,18 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	ErrormodelFactory getErrormodelFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype <em>Error Model Prototype</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype
+	 * <em>Error Model Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Model Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype
 	 * @generated
@@ -1817,9 +2048,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getErrorModelPrototype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property
+	 * <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getBase_Property()
 	 * @see #getErrorModelPrototype()
@@ -1828,9 +2061,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_Base_Property();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget <em>Function Target</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget <em>Function Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Function Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget()
 	 * @see #getErrorModelPrototype()
@@ -1839,9 +2074,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_FunctionTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget <em>Hw Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget
+	 * <em>Hw Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hw Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget()
 	 * @see #getErrorModelPrototype()
@@ -1850,9 +2087,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_HwTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget_path <em>Function Target path</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget_path <em>Function Target path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Function Target path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getFunctionTarget_path()
 	 * @see #getErrorModelPrototype()
@@ -1861,9 +2100,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_FunctionTarget_path();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget_path <em>Hw Target path</em>}'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget_path <em>Hw Target path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Hw Target path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getHwTarget_path()
 	 * @see #getErrorModelPrototype()
@@ -1872,9 +2113,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_HwTarget_path();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget
+	 * <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getTarget()
 	 * @see #getErrorModelPrototype()
@@ -1883,9 +2126,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelPrototype_Target();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getType
+	 * <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype#getType()
 	 * @see #getErrorModelPrototype()
@@ -1897,6 +2142,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType <em>Error Model Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Model Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType
 	 * @generated
@@ -1904,9 +2150,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getErrorModelType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getBase_Class()
 	 * @see #getErrorModelType()
@@ -1915,9 +2163,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription <em>Error Behavior Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Error Behavior Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getErrorBehaviorDescription()
 	 * @see #getErrorModelType()
@@ -1926,9 +2176,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_ErrorBehaviorDescription();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getExternalFault <em>External Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getExternalFault
+	 * <em>External Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>External Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getExternalFault()
 	 * @see #getErrorModelType()
@@ -1937,9 +2189,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_ExternalFault();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFailure <em>Failure</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFailure
+	 * <em>Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFailure()
 	 * @see #getErrorModelType()
@@ -1948,9 +2202,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_Failure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFaultFailureConnector <em>Fault Failure Connector</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFaultFailureConnector <em>Fault Failure Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Fault Failure Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getFaultFailureConnector()
 	 * @see #getErrorModelType()
@@ -1959,9 +2215,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_FaultFailureConnector();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription <em>Generic Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription
+	 * <em>Generic Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Generic Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getGenericDescription()
 	 * @see #getErrorModelType()
@@ -1970,9 +2228,11 @@ public interface ErrormodelPackage extends EPackage {
 	EAttribute getErrorModelType_GenericDescription();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getHwTarget <em>Hw Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getHwTarget
+	 * <em>Hw Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hw Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getHwTarget()
 	 * @see #getErrorModelType()
@@ -1981,9 +2241,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_HwTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getInternalFault <em>Internal Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getInternalFault
+	 * <em>Internal Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Internal Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getInternalFault()
 	 * @see #getErrorModelType()
@@ -1992,9 +2254,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_InternalFault();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getPart <em>Part</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getPart
+	 * <em>Part</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Part</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getPart()
 	 * @see #getErrorModelType()
@@ -2003,9 +2267,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_Part();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getProcessFault <em>Process Fault</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getProcessFault
+	 * <em>Process Fault</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Process Fault</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getProcessFault()
 	 * @see #getErrorModelType()
@@ -2014,9 +2280,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getErrorModelType_ProcessFault();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getTarget
+	 * <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType#getTarget()
 	 * @see #getErrorModelType()
@@ -2028,6 +2296,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort <em>Failure Out Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Failure Out Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort
 	 * @generated
@@ -2038,6 +2307,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort <em>Fault Failure Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fault Failure Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort
 	 * @generated
@@ -2045,9 +2315,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getFaultFailurePort();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port <em>Base Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port
+	 * <em>Base Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port()
 	 * @see #getFaultFailurePort()
@@ -2056,9 +2328,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePort_Base_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget <em>Function Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget
+	 * <em>Function Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Function Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget()
 	 * @see #getFaultFailurePort()
@@ -2067,9 +2341,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePort_FunctionTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget <em>Hw Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget
+	 * <em>Hw Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hw Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget()
 	 * @see #getFaultFailurePort()
@@ -2078,9 +2354,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePort_HwTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget_path <em>Function Target path</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget_path <em>Function Target path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Function Target path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget_path()
 	 * @see #getFaultFailurePort()
@@ -2089,9 +2367,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePort_FunctionTarget_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget_path <em>Hw Target path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget_path
+	 * <em>Hw Target path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hw Target path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget_path()
 	 * @see #getFaultFailurePort()
@@ -2100,9 +2380,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePort_HwTarget_path();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink <em>Fault Failure Propagation Link</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink
+	 * <em>Fault Failure Propagation Link</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fault Failure Propagation Link</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink
 	 * @generated
@@ -2110,9 +2392,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getFaultFailurePropagationLink();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector <em>Base Connector</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector <em>Base Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector()
 	 * @see #getFaultFailurePropagationLink()
@@ -2121,9 +2405,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePropagationLink_Base_Connector();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort <em>From Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort
+	 * <em>From Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>From Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort()
 	 * @see #getFaultFailurePropagationLink()
@@ -2132,9 +2418,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePropagationLink_FromPort();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort_path <em>From Port path</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort_path <em>From Port path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>From Port path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort_path()
 	 * @see #getFaultFailurePropagationLink()
@@ -2143,9 +2431,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePropagationLink_FromPort_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort_path <em>To Port path</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort_path <em>To Port path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>To Port path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort_path()
 	 * @see #getFaultFailurePropagationLink()
@@ -2154,9 +2444,12 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getFaultFailurePropagationLink_ToPort_path();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation <em>Immediate Propagation</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation <em>Immediate Propagation</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Immediate Propagation</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation()
 	 * @see #getFaultFailurePropagationLink()
@@ -2165,9 +2458,11 @@ public interface ErrormodelPackage extends EPackage {
 	EAttribute getFaultFailurePropagationLink_ImmediatePropagation();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort <em>To Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort
+	 * <em>To Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>To Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort()
 	 * @see #getFaultFailurePropagationLink()
@@ -2179,6 +2474,7 @@ public interface ErrormodelPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort <em>Fault In Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fault In Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort
 	 * @generated
@@ -2186,9 +2482,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getFaultInPort();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype <em>Internal Fault Prototype</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype
+	 * <em>Internal Fault Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Internal Fault Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype
 	 * @generated
@@ -2196,9 +2494,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getInternalFaultPrototype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class()
 	 * @see #getInternalFaultPrototype()
@@ -2207,9 +2507,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getInternalFaultPrototype_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event <em>Base Event</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event
+	 * <em>Base Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event()
 	 * @see #getInternalFaultPrototype()
@@ -2218,9 +2520,11 @@ public interface ErrormodelPackage extends EPackage {
 	EReference getInternalFaultPrototype_Base_Event();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype <em>Process Fault Prototype</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype
+	 * <em>Process Fault Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Process Fault Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype
 	 * @generated
@@ -2228,9 +2532,11 @@ public interface ErrormodelPackage extends EPackage {
 	EClass getProcessFaultPrototype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event <em>Base Event</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event
+	 * <em>Base Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event()
 	 * @see #getProcessFaultPrototype()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FailureOutPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FailureOutPort.java
index b1401483900..37bfdf61cf6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FailureOutPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FailureOutPort.java
@@ -21,25 +21,27 @@ package org.eclipse.papyrus.eastadl.dependability.errormodel;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Failure Out Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The FailureOutPort represents a propagation point for failures that propagate out from the containing ErrorModelType.The EADatatype of the FailureOutPort defines the range of valid failures.
+ * The FailureOutPort represents a propagation point for failures that propagate out from the containing ErrorModelType.The EADatatype of the
+ * FailureOutPort defines the range of valid failures.
  * 
  * 
  * Constraints:
  * [1] The direction of the nominal port must be out.
  * 
  * Semantics:
- * The value range of a FailureOutPort represents failures that can propagate to FaultInPorts in other ErrorModels. The value range is defined by the FailureOutPort’s EADatatype.
+ * The value range of a FailureOutPort represents failures that can propagate to FaultInPorts in other ErrorModels. The value range is defined by the
+ * FailureOutPort’s EADatatype.
  * 
  * If nominal Ports HWTargets or FunctionTargets are referenced, the failures of the FailureOutPort correspond to data on these nominal ports.
  * 
  * 
- * Extension: 
+ * Extension:
  * UML::Port
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFailureOutPort()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePort.java
index 9693f6d6ba8..745be019cf9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePort.java
@@ -27,31 +27,32 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Fault Failure Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget <em>Function Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget_path <em>Function Target path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget_path <em>Hw Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget <em>Function Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getFunctionTarget_path <em>Function Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getHwTarget_path <em>Hw Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort()
  * @model abstract="true"
  * @generated
  */
 public interface FaultFailurePort extends Anomaly {
+
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort_Base_Port()
@@ -61,10 +62,13 @@ public interface FaultFailurePort extends Anomaly {
 	Port getBase_Port();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port <em>Base Port</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort#getBase_Port <em>Base Port</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
@@ -75,10 +79,10 @@ public interface FaultFailurePort extends Anomaly {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort_FunctionTarget()
 	 * @model ordered="false"
@@ -91,10 +95,10 @@ public interface FaultFailurePort extends Anomaly {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hw Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hw Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort_HwTarget()
 	 * @model ordered="false"
@@ -107,10 +111,10 @@ public interface FaultFailurePort extends Anomaly {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Target path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Target path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Target path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort_FunctionTarget_path()
 	 * @model
@@ -123,10 +127,10 @@ public interface FaultFailurePort extends Anomaly {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hw Target path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hw Target path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hw Target path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePort_HwTarget_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePropagationLink.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePropagationLink.java
index 680d6c950d9..1fe7052a8ff 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePropagationLink.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultFailurePropagationLink.java
@@ -24,51 +24,55 @@ import org.eclipse.uml2.uml.Connector;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Fault Failure Propagation Link</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The FaultFailurePropagationLink metaclass represents the links for the propagations of faults/failures across system elements. In particular, it defines that one error model provides the faults/failures that another error model receives.
+ * The FaultFailurePropagationLink metaclass represents the links for the propagations of faults/failures across system elements. In particular, it
+ * defines that one error model provides the faults/failures that another error model receives.
  * 
- * A fault/failure link can only be applied to compatible ports, either for fault/failure delegation within an error model or for fault/failure transmission across two error models. A FaultFailurePropagationLink can only connect fault/failure ports that have compatible types. 
+ * A fault/failure link can only be applied to compatible ports, either for fault/failure delegation within an error model or for fault/failure
+ * transmission across two error models. A FaultFailurePropagationLink can only connect fault/failure ports that have compatible types.
  * 
  * Constraints:
  * [1] Only compatible fromPort-toPort pairs may be connectedNo additional constraints
  * 
- * [2] Two fault/failure ports are compatible if the EADatatype of the fromPort represents a subset of the Fault/Failure set represented by the toPort’s EADatatype. 
+ * [2] Two fault/failure ports are compatible if the EADatatype of the fromPort represents a subset of the Fault/Failure set represented by the
+ * toPort’s EADatatype.
  * 
  * 
  * Semantics:
- * The FaultFailurePropagationLink defines a Failure propagation path, from the fromPort on one error model to the toPort of another error model. 
+ * The FaultFailurePropagationLink defines a Failure propagation path, from the fromPort on one error model to the toPort of another error model.
  * 
  * 
  * Extension:
  * UML::Connector
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation <em>Immediate Propagation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort <em>To Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort <em>From Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort_path <em>From Port path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort_path <em>To Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation <em>Immediate Propagation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort <em>To Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort <em>From Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getFromPort_path <em>From Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getToPort_path <em>To Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink()
  * @model
  * @generated
  */
 public interface FaultFailurePropagationLink extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Connector</em>' reference.
 	 * @see #setBase_Connector(Connector)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_Base_Connector()
@@ -78,10 +82,13 @@ public interface FaultFailurePropagationLink extends EAElement {
 	Connector getBase_Connector();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector <em>Base Connector</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#getBase_Connector
+	 * <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Connector</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Connector</em>' reference.
 	 * @see #getBase_Connector()
 	 * @generated
 	 */
@@ -91,10 +98,10 @@ public interface FaultFailurePropagationLink extends EAElement {
 	 * Returns the value of the '<em><b>From Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>From Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>From Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>From Port</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_FromPort()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -107,10 +114,10 @@ public interface FaultFailurePropagationLink extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>From Port path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>From Port path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>From Port path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_FromPort_path()
 	 * @model
@@ -123,10 +130,10 @@ public interface FaultFailurePropagationLink extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>To Port path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>To Port path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>To Port path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_ToPort_path()
 	 * @model
@@ -138,10 +145,10 @@ public interface FaultFailurePropagationLink extends EAElement {
 	 * Returns the value of the '<em><b>To Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>To Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>To Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>To Port</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_ToPort()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -154,10 +161,10 @@ public interface FaultFailurePropagationLink extends EAElement {
 	 * The default value is <code>"true"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Immediate Propagation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Immediate Propagation</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Immediate Propagation</em>' attribute.
 	 * @see #setImmediatePropagation(boolean)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultFailurePropagationLink_ImmediatePropagation()
@@ -167,10 +174,13 @@ public interface FaultFailurePropagationLink extends EAElement {
 	boolean isImmediatePropagation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation <em>Immediate Propagation</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink#isImmediatePropagation
+	 * <em>Immediate Propagation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Immediate Propagation</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Immediate Propagation</em>' attribute.
 	 * @see #isImmediatePropagation()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultInPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultInPort.java
index 4c1957d8494..36a24750461 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultInPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/FaultInPort.java
@@ -21,24 +21,26 @@ package org.eclipse.papyrus.eastadl.dependability.errormodel;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Fault In Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The FaultInPort represents a propagation point for faults that propagate to the containing ErrorModelType. The EADatatype of the FaultInPort defines the range of valid failures.
+ * The FaultInPort represents a propagation point for faults that propagate to the containing ErrorModelType. The EADatatype of the FaultInPort
+ * defines the range of valid failures.
  * 
  * Constraints:
  * [1] The direction of the nominal port must be in.
  * 
  * Semantics:
- * The value range of a FaultInPort represents faults propagated from a FailureOutPort in another ErrorModel. The value range is defined by the FaultInPort’s EADatatype.
+ * The value range of a FaultInPort represents faults propagated from a FailureOutPort in another ErrorModel. The value range is defined by the
+ * FaultInPort’s EADatatype.
  * 
  * If nominal Ports HWTarget or FunctionTarget are referenced, the faults on the FaultInPort.
  * 
  * 
- * Extension: 
+ * Extension:
  * UML::Port
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getFaultInPort()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/InternalFaultPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/InternalFaultPrototype.java
index 1aa1399c934..c3e7c325011 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/InternalFaultPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/InternalFaultPrototype.java
@@ -21,9 +21,10 @@ import org.eclipse.uml2.uml.Event;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Internal Fault Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The InternalFault metaclass represents the particular internal conditions of the target component/system that are of particular concern for its fault/failure definition. 
+ * The InternalFault metaclass represents the particular internal conditions of the target component/system that are of particular concern for its
+ * fault/failure definition.
  * 
  * Semantics:
  * The system anomaly represented by an InternalFault, which when activated, can cause errors and failures of the target element.
@@ -31,28 +32,29 @@ import org.eclipse.uml2.uml.Event;
  * Extension:
  * UML::Part / UML::Event
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event <em>Base Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event <em>Base Event</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getInternalFaultPrototype()
  * @model
  * @generated
  */
 public interface InternalFaultPrototype extends Anomaly {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getInternalFaultPrototype_Base_Class()
@@ -62,10 +64,13 @@ public interface InternalFaultPrototype extends Anomaly {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -75,10 +80,10 @@ public interface InternalFaultPrototype extends Anomaly {
 	 * Returns the value of the '<em><b>Base Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Event</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Event</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Event</em>' reference.
 	 * @see #setBase_Event(Event)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getInternalFaultPrototype_Base_Event()
@@ -88,10 +93,13 @@ public interface InternalFaultPrototype extends Anomaly {
 	Event getBase_Event();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event <em>Base Event</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype#getBase_Event <em>Base Event</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Event</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Event</em>' reference.
 	 * @see #getBase_Event()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ProcessFaultPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ProcessFaultPrototype.java
index cbbb963701b..f4ee97ad349 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ProcessFaultPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/ProcessFaultPrototype.java
@@ -21,37 +21,40 @@ import org.eclipse.uml2.uml.Event;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Process Fault Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The ProcessFaultPrototype metaclass represents the anomalies that the target component/system can have due to design or implementation flaws (e.g., incorrect requirements, buffer size configuration, scheduling, etc.). 
+ * The ProcessFaultPrototype metaclass represents the anomalies that the target component/system can have due to design or implementation flaws (e.g.,
+ * incorrect requirements, buffer size configuration, scheduling, etc.).
  * 
- * Semantics: 
- * The ProcessFaultPrototype metaclass represents the anomalies that the target component/system can have due to design or implementation flaws (e.g., incorrect requirements, buffer size configuration, scheduling, etc.).
+ * Semantics:
+ * The ProcessFaultPrototype metaclass represents the anomalies that the target component/system can have due to design or implementation flaws (e.g.,
+ * incorrect requirements, buffer size configuration, scheduling, etc.).
  * 
  * Extension:
  * UML::Part / UML::Event
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event <em>Base Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event <em>Base Event</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getProcessFaultPrototype()
  * @model
  * @generated
  */
 public interface ProcessFaultPrototype extends Anomaly {
+
 	/**
 	 * Returns the value of the '<em><b>Base Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Event</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Event</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Event</em>' reference.
 	 * @see #setBase_Event(Event)
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#getProcessFaultPrototype_Base_Event()
@@ -61,10 +64,13 @@ public interface ProcessFaultPrototype extends Anomaly {
 	Event getBase_Event();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event <em>Base Event</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype#getBase_Event <em>Base Event</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Event</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Event</em>' reference.
 	 * @see #getBase_Event()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/AnomalyImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/AnomalyImpl.java
index 278ea41cdd0..b1493605cea 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/AnomalyImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/AnomalyImpl.java
@@ -33,19 +33,21 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getGenericDescription <em>Generic Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getGenericDescription <em>Generic Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.AnomalyImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnomalyImpl extends EAElementImpl implements Anomaly {
+
 	/**
 	 * The default value of the '{@link #getGenericDescription() <em>Generic Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericDescription()
 	 * @generated
 	 * @ordered
@@ -56,6 +58,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	 * The cached value of the '{@link #getGenericDescription() <em>Generic Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericDescription()
 	 * @generated
 	 * @ordered
@@ -66,6 +69,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
@@ -76,6 +80,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -85,6 +90,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnomalyImpl() {
@@ -94,6 +100,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype basicGetType() {
@@ -103,31 +110,35 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(EADatatype newType) {
 		EADatatype oldType = type;
 		type = newType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ANOMALY__TYPE, oldType, type));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
-				return getGenericDescription();
-			case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
-			case ErrormodelPackage.ANOMALY__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		switch(featureID) {
+		case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
+			return getGenericDescription();
+		case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
+		case ErrormodelPackage.ANOMALY__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -135,17 +146,18 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
-				return GENERIC_DESCRIPTION_EDEFAULT == null ? genericDescription != null : !GENERIC_DESCRIPTION_EDEFAULT.equals(genericDescription);
-			case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
-				return base_Property != null;
-			case ErrormodelPackage.ANOMALY__TYPE:
-				return type != null;
+		switch(featureID) {
+		case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
+			return GENERIC_DESCRIPTION_EDEFAULT == null ? genericDescription != null : !GENERIC_DESCRIPTION_EDEFAULT.equals(genericDescription);
+		case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
+			return base_Property != null;
+		case ErrormodelPackage.ANOMALY__TYPE:
+			return type != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -153,20 +165,21 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
-				setGenericDescription((String)newValue);
-				return;
-			case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
-			case ErrormodelPackage.ANOMALY__TYPE:
-				setType((EADatatype)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
+			setGenericDescription((String)newValue);
+			return;
+		case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
+		case ErrormodelPackage.ANOMALY__TYPE:
+			setType((EADatatype)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -174,6 +187,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -184,20 +198,21 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
-				setGenericDescription(GENERIC_DESCRIPTION_EDEFAULT);
-				return;
-			case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
-			case ErrormodelPackage.ANOMALY__TYPE:
-				setType((EADatatype)null);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION:
+			setGenericDescription(GENERIC_DESCRIPTION_EDEFAULT);
+			return;
+		case ErrormodelPackage.ANOMALY__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
+		case ErrormodelPackage.ANOMALY__TYPE:
+			setType((EADatatype)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -205,6 +220,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getGenericDescription() {
@@ -214,14 +230,15 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype getType() {
-		if (type != null && type.eIsProxy()) {
+		if(type != null && type.eIsProxy()) {
 			InternalEObject oldType = (InternalEObject)type;
 			type = (EADatatype)eResolveProxy(oldType);
-			if (type != oldType) {
-				if (eNotificationRequired())
+			if(type != oldType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ANOMALY__TYPE, oldType, type));
 			}
 		}
@@ -231,26 +248,28 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGenericDescription(String newGenericDescription) {
 		String oldGenericDescription = genericDescription;
 		genericDescription = newGenericDescription;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ANOMALY__GENERIC_DESCRIPTION, oldGenericDescription, genericDescription));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ANOMALY__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -260,6 +279,7 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -269,23 +289,26 @@ public class AnomalyImpl extends EAElementImpl implements Anomaly {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ANOMALY__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (genericDescription: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorBehaviorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorBehaviorImpl.java
index fc924b5e5a3..ad6f52ee948 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorBehaviorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorBehaviorImpl.java
@@ -43,24 +43,26 @@ import org.eclipse.uml2.uml.Behavior;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getBase_Behavior <em>Base Behavior</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getFailureLogic <em>Failure Logic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getInternalFault <em>Internal Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getExternalFailure <em>External Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getExternalFault <em>External Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getProcessFault <em>Process Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getBase_Behavior <em>Base Behavior</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getFailureLogic <em>Failure Logic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getInternalFault <em>Internal Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getOwner <em>Owner</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getExternalFailure <em>External Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getExternalFault <em>External Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorBehaviorImpl#getProcessFault <em>Process Fault</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
+
 	/**
 	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Behavior()
 	 * @generated
 	 * @ordered
@@ -71,6 +73,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The default value of the '{@link #getFailureLogic() <em>Failure Logic</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFailureLogic()
 	 * @generated
 	 * @ordered
@@ -81,6 +84,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getFailureLogic() <em>Failure Logic</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFailureLogic()
 	 * @generated
 	 * @ordered
@@ -91,6 +95,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -101,6 +106,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -111,6 +117,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getInternalFault() <em>Internal Fault</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getInternalFault()
 	 * @generated
 	 * @ordered
@@ -121,6 +128,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOwner()
 	 * @generated
 	 * @ordered
@@ -131,6 +139,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getExternalFailure() <em>External Failure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExternalFailure()
 	 * @generated
 	 * @ordered
@@ -141,6 +150,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getExternalFault() <em>External Fault</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExternalFault()
 	 * @generated
 	 * @ordered
@@ -151,6 +161,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	 * The cached value of the '{@link #getProcessFault() <em>Process Fault</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProcessFault()
 	 * @generated
 	 * @ordered
@@ -160,6 +171,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorBehaviorImpl() {
@@ -169,6 +181,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModelType basicGetOwner() {
@@ -178,14 +191,18 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetOwner(ErrorModelType newOwner, NotificationChain msgs) {
 		ErrorModelType oldOwner = owner;
 		owner = newOwner;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_BEHAVIOR__OWNER, oldOwner, newOwner);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -193,29 +210,32 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
-				if (resolve) return getBase_Behavior();
-				return basicGetBase_Behavior();
-			case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
-				return getFailureLogic();
-			case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
-				return getType();
-			case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
-				return getInternalFault();
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				if (resolve) return getOwner();
-				return basicGetOwner();
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
-				return getExternalFailure();
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
-				return getExternalFault();
-			case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
-				return getProcessFault();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
+			if(resolve)
+				return getBase_Behavior();
+			return basicGetBase_Behavior();
+		case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
+			return getFailureLogic();
+		case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
+			return getType();
+		case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
+			return getInternalFault();
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			if(resolve)
+				return getOwner();
+			return basicGetOwner();
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
+			return getExternalFailure();
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
+			return getExternalFault();
+		case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
+			return getProcessFault();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -223,15 +243,16 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				if (owner != null)
-					msgs = ((InternalEObject)owner).eInverseRemove(this, ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION, ErrorModelType.class, msgs);
-				return basicSetOwner((ErrorModelType)otherEnd, msgs);
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			if(owner != null)
+				msgs = ((InternalEObject)owner).eInverseRemove(this, ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION, ErrorModelType.class, msgs);
+			return basicSetOwner((ErrorModelType)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -239,13 +260,14 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				return basicSetOwner(null, msgs);
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			return basicSetOwner(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -253,27 +275,28 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
-				return base_Behavior != null;
-			case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
-				return FAILURE_LOGIC_EDEFAULT == null ? failureLogic != null : !FAILURE_LOGIC_EDEFAULT.equals(failureLogic);
-			case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
-				return type != TYPE_EDEFAULT;
-			case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
-				return internalFault != null && !internalFault.isEmpty();
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				return owner != null;
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
-				return externalFailure != null && !externalFailure.isEmpty();
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
-				return externalFault != null && !externalFault.isEmpty();
-			case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
-				return processFault != null && !processFault.isEmpty();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
+			return base_Behavior != null;
+		case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
+			return FAILURE_LOGIC_EDEFAULT == null ? failureLogic != null : !FAILURE_LOGIC_EDEFAULT.equals(failureLogic);
+		case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
+			return type != TYPE_EDEFAULT;
+		case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
+			return internalFault != null && !internalFault.isEmpty();
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			return owner != null;
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
+			return externalFailure != null && !externalFailure.isEmpty();
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
+			return externalFault != null && !externalFault.isEmpty();
+		case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
+			return processFault != null && !processFault.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -281,40 +304,41 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
-				setBase_Behavior((Behavior)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
-				setFailureLogic((String)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
-				setType((ErrorBehaviorKind)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
-				getInternalFault().clear();
-				getInternalFault().addAll((Collection<? extends InternalFaultPrototype>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				setOwner((ErrorModelType)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
-				getExternalFailure().clear();
-				getExternalFailure().addAll((Collection<? extends FailureOutPort>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
-				getExternalFault().clear();
-				getExternalFault().addAll((Collection<? extends FaultInPort>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
-				getProcessFault().clear();
-				getProcessFault().addAll((Collection<? extends ProcessFaultPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
+			setBase_Behavior((Behavior)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
+			setFailureLogic((String)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
+			setType((ErrorBehaviorKind)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
+			getInternalFault().clear();
+			getInternalFault().addAll((Collection<? extends InternalFaultPrototype>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			setOwner((ErrorModelType)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
+			getExternalFailure().clear();
+			getExternalFailure().addAll((Collection<? extends FailureOutPort>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
+			getExternalFault().clear();
+			getExternalFault().addAll((Collection<? extends FaultInPort>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
+			getProcessFault().clear();
+			getProcessFault().addAll((Collection<? extends ProcessFaultPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -322,6 +346,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -332,14 +357,15 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Behavior getBase_Behavior() {
-		if (base_Behavior != null && base_Behavior.eIsProxy()) {
+		if(base_Behavior != null && base_Behavior.eIsProxy()) {
 			InternalEObject oldBase_Behavior = (InternalEObject)base_Behavior;
 			base_Behavior = (Behavior)eResolveProxy(oldBase_Behavior);
-			if (base_Behavior != oldBase_Behavior) {
-				if (eNotificationRequired())
+			if(base_Behavior != oldBase_Behavior) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));
 			}
 		}
@@ -349,6 +375,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Behavior basicGetBase_Behavior() {
@@ -358,47 +385,49 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Behavior(Behavior newBase_Behavior) {
 		Behavior oldBase_Behavior = base_Behavior;
 		base_Behavior = newBase_Behavior;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
-				setBase_Behavior((Behavior)null);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
-				setFailureLogic(FAILURE_LOGIC_EDEFAULT);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
-				getInternalFault().clear();
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
-				setOwner((ErrorModelType)null);
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
-				getExternalFailure().clear();
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
-				getExternalFault().clear();
-				return;
-			case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
-				getProcessFault().clear();
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR__BASE_BEHAVIOR:
+			setBase_Behavior((Behavior)null);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC:
+			setFailureLogic(FAILURE_LOGIC_EDEFAULT);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT:
+			getInternalFault().clear();
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__OWNER:
+			setOwner((ErrorModelType)null);
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE:
+			getExternalFailure().clear();
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT:
+			getExternalFault().clear();
+			return;
+		case ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT:
+			getProcessFault().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -406,10 +435,11 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FailureOutPort> getExternalFailure() {
-		if (externalFailure == null) {
+		if(externalFailure == null) {
 			externalFailure = new EObjectResolvingEList<FailureOutPort>(FailureOutPort.class, this, ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAILURE);
 		}
 		return externalFailure;
@@ -418,10 +448,11 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FaultInPort> getExternalFault() {
-		if (externalFault == null) {
+		if(externalFault == null) {
 			externalFault = new EObjectResolvingEList<FaultInPort>(FaultInPort.class, this, ErrormodelPackage.ERROR_BEHAVIOR__EXTERNAL_FAULT);
 		}
 		return externalFault;
@@ -430,6 +461,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFailureLogic() {
@@ -439,22 +471,24 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFailureLogic(String newFailureLogic) {
 		String oldFailureLogic = failureLogic;
 		failureLogic = newFailureLogic;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_BEHAVIOR__FAILURE_LOGIC, oldFailureLogic, failureLogic));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<InternalFaultPrototype> getInternalFault() {
-		if (internalFault == null) {
+		if(internalFault == null) {
 			internalFault = new EObjectResolvingEList<InternalFaultPrototype>(InternalFaultPrototype.class, this, ErrormodelPackage.ERROR_BEHAVIOR__INTERNAL_FAULT);
 		}
 		return internalFault;
@@ -463,14 +497,15 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModelType getOwner() {
-		if (owner != null && owner.eIsProxy()) {
+		if(owner != null && owner.eIsProxy()) {
 			InternalEObject oldOwner = (InternalEObject)owner;
 			owner = (ErrorModelType)eResolveProxy(oldOwner);
-			if (owner != oldOwner) {
-				if (eNotificationRequired())
+			if(owner != oldOwner) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ERROR_BEHAVIOR__OWNER, oldOwner, owner));
 			}
 		}
@@ -480,10 +515,11 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ProcessFaultPrototype> getProcessFault() {
-		if (processFault == null) {
+		if(processFault == null) {
 			processFault = new EObjectResolvingEList<ProcessFaultPrototype>(ProcessFaultPrototype.class, this, ErrormodelPackage.ERROR_BEHAVIOR__PROCESS_FAULT);
 		}
 		return processFault;
@@ -492,6 +528,7 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorBehaviorKind getType() {
@@ -501,42 +538,46 @@ public class ErrorBehaviorImpl extends EAElementImpl implements ErrorBehavior {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOwner(ErrorModelType newOwner) {
-		if (newOwner != owner) {
+		if(newOwner != owner) {
 			NotificationChain msgs = null;
-			if (owner != null)
+			if(owner != null)
 				msgs = ((InternalEObject)owner).eInverseRemove(this, ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION, ErrorModelType.class, msgs);
-			if (newOwner != null)
+			if(newOwner != null)
 				msgs = ((InternalEObject)newOwner).eInverseAdd(this, ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION, ErrorModelType.class, msgs);
 			msgs = basicSetOwner(newOwner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_BEHAVIOR__OWNER, newOwner, newOwner));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(ErrorBehaviorKind newType) {
 		ErrorBehaviorKind oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_BEHAVIOR__TYPE, oldType, type));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (failureLogic: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelPrototypeImpl.java
index f81a6d7dffe..edc44794e74 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelPrototypeImpl.java
@@ -43,16 +43,16 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getFunctionTarget <em>Function Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getFunctionTarget_path <em>Function Target path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getHwTarget_path <em>Hw Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getFunctionTarget <em>Function Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getFunctionTarget_path <em>Function Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelPrototypeImpl#getHwTarget_path <em>Hw Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModelPrototype {
@@ -61,6 +61,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
@@ -71,6 +72,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
@@ -80,6 +82,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * The cached value of the '{@link #getFunctionTarget() <em>Function Target</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionTarget()
 	 * @generated
 	 * @ordered
@@ -100,6 +103,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	 * The cached value of the '{@link #getFunctionTarget_path() <em>Function Target path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionTarget_path()
 	 * @generated
 	 * @ordered
@@ -110,6 +114,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	 * The cached value of the '{@link #getHwTarget_path() <em>Hw Target path</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHwTarget_path()
 	 * @generated
 	 * @ordered
@@ -118,6 +123,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModelPrototypeImpl() {
@@ -126,6 +132,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetTarget() {
@@ -146,7 +153,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 			Type basicType = getBase_Property().getType();
 
 			if(basicType != null) {
-				type=(ErrorModelType)UMLUtil.getStereotypeApplication(basicType, ErrorModelType.class);
+				type = (ErrorModelType)UMLUtil.getStereotypeApplication(basicType, ErrorModelType.class);
 			}
 		}
 
@@ -155,106 +162,114 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
-				if (resolve) return getTarget();
-				return basicGetTarget();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
-				return getFunctionTarget();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
-				return getHwTarget();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
-				return getFunctionTarget_path();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
-				return getHwTarget_path();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
+			if(resolve)
+				return getTarget();
+			return basicGetTarget();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
+			return getFunctionTarget();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
+			return getHwTarget();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
+			return getFunctionTarget_path();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
+			return getHwTarget_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
-				return ((InternalEList<?>)getHwTarget_path()).basicRemove(otherEnd, msgs);
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
+			return ((InternalEList<?>)getHwTarget_path()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
-				return base_Property != null;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TYPE:
-				return basicGetType() != null;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
-				return target != null;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
-				return functionTarget != null && !functionTarget.isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
-				return hwTarget != null && !hwTarget.isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
-				return functionTarget_path != null && !functionTarget_path.isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
-				return hwTarget_path != null && !hwTarget_path.isEmpty();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
+			return base_Property != null;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TYPE:
+			return basicGetType() != null;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
+			return target != null;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
+			return functionTarget != null && !functionTarget.isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
+			return hwTarget != null && !hwTarget.isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
+			return functionTarget_path != null && !functionTarget_path.isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
+			return hwTarget_path != null && !hwTarget_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
-				setTarget((NamedElement)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
-				getFunctionTarget().clear();
-				getFunctionTarget().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
-				getHwTarget().clear();
-				getHwTarget().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
-				getFunctionTarget_path().clear();
-				getFunctionTarget_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
-				getHwTarget_path().clear();
-				getHwTarget_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
+			setTarget((NamedElement)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
+			getFunctionTarget().clear();
+			getFunctionTarget().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
+			getHwTarget().clear();
+			getHwTarget().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
+			getFunctionTarget_path().clear();
+			getFunctionTarget_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
+			getHwTarget_path().clear();
+			getHwTarget_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,14 +280,15 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -282,6 +298,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -291,50 +308,53 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
-				setTarget((NamedElement)null);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
-				getFunctionTarget().clear();
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
-				getHwTarget().clear();
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
-				getFunctionTarget_path().clear();
-				return;
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
-				getHwTarget_path().clear();
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET:
+			setTarget((NamedElement)null);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET:
+			getFunctionTarget().clear();
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET:
+			getHwTarget().clear();
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH:
+			getFunctionTarget_path().clear();
+			return;
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH:
+			getHwTarget_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getFunctionTarget() {
-		if (functionTarget == null) {
+		if(functionTarget == null) {
 			functionTarget = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET);
 		}
 		return functionTarget;
@@ -342,10 +362,11 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getHwTarget() {
-		if (hwTarget == null) {
+		if(hwTarget == null) {
 			hwTarget = new EObjectResolvingEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET);
 		}
 		return hwTarget;
@@ -354,10 +375,11 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getFunctionTarget_path() {
-		if (functionTarget_path == null) {
+		if(functionTarget_path == null) {
 			functionTarget_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__FUNCTION_TARGET_PATH);
 		}
 		return functionTarget_path;
@@ -366,10 +388,11 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getHwTarget_path() {
-		if (hwTarget_path == null) {
+		if(hwTarget_path == null) {
 			hwTarget_path = new EObjectContainmentEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__HW_TARGET_PATH);
 		}
 		return hwTarget_path;
@@ -377,14 +400,15 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getTarget() {
-		if (target != null && target.eIsProxy()) {
+		if(target != null && target.eIsProxy()) {
 			InternalEObject oldTarget = (InternalEObject)target;
 			target = (NamedElement)eResolveProxy(oldTarget);
-			if (target != oldTarget) {
-				if (eNotificationRequired())
+			if(target != oldTarget) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET, oldTarget, target));
 			}
 		}
@@ -393,6 +417,7 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModelType getType() {
@@ -402,12 +427,13 @@ public class ErrorModelPrototypeImpl extends EAElementImpl implements ErrorModel
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTarget(NamedElement newTarget) {
 		NamedElement oldTarget = target;
 		target = newTarget;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_MODEL_PROTOTYPE__TARGET, oldTarget, target));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelTypeImpl.java
index b18a8d091f4..80f44145219 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrorModelTypeImpl.java
@@ -53,20 +53,21 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getGenericDescription <em>Generic Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getFaultFailureConnector <em>Fault Failure Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getPart <em>Part</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getFailure <em>Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getExternalFault <em>External Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getInternalFault <em>Internal Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getProcessFault <em>Process Fault</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getErrorBehaviorDescription <em>Error Behavior Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getGenericDescription <em>Generic Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getFaultFailureConnector <em>Fault Failure Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getFailure <em>Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getExternalFault <em>External Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getInternalFault <em>Internal Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getProcessFault <em>Process Fault</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ErrorModelTypeImpl#getErrorBehaviorDescription <em>Error Behavior Description
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements ErrorModelType {
@@ -75,6 +76,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -84,6 +86,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	/**
 	 * The default value of the '{@link #getGenericDescription() <em>Generic Description</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericDescription()
 	 * @generated
 	 * @ordered
@@ -93,6 +96,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	/**
 	 * The cached value of the '{@link #getGenericDescription() <em>Generic Description</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericDescription()
 	 * @generated
 	 * @ordered
@@ -123,6 +127,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	 * The cached value of the '{@link #getErrorBehaviorDescription() <em>Error Behavior Description</em>}' reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getErrorBehaviorDescription()
 	 * @generated
 	 * @ordered
@@ -131,6 +136,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModelTypeImpl() {
@@ -139,130 +145,137 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
-				return getGenericDescription();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__FAULT_FAILURE_CONNECTOR:
-				return getFaultFailureConnector();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__PART:
-				return getPart();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__FAILURE:
-				return getFailure();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__EXTERNAL_FAULT:
-				return getExternalFault();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__INTERNAL_FAULT:
-				return getInternalFault();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__PROCESS_FAULT:
-				return getProcessFault();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
-				return getTarget();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
-				return getHwTarget();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				return getErrorBehaviorDescription();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
+			return getGenericDescription();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__FAULT_FAILURE_CONNECTOR:
+			return getFaultFailureConnector();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__PART:
+			return getPart();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__FAILURE:
+			return getFailure();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__EXTERNAL_FAULT:
+			return getExternalFault();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__INTERNAL_FAULT:
+			return getInternalFault();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__PROCESS_FAULT:
+			return getProcessFault();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
+			return getTarget();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
+			return getHwTarget();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			return getErrorBehaviorDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getErrorBehaviorDescription()).basicAdd(otherEnd, msgs);
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getErrorBehaviorDescription()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				return ((InternalEList<?>)getErrorBehaviorDescription()).basicRemove(otherEnd, msgs);
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			return ((InternalEList<?>)getErrorBehaviorDescription()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
-				return base_Class != null;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
-				return GENERIC_DESCRIPTION_EDEFAULT == null ? genericDescription != null : !GENERIC_DESCRIPTION_EDEFAULT.equals(genericDescription);
-			case ErrormodelPackage.ERROR_MODEL_TYPE__FAULT_FAILURE_CONNECTOR:
-				return !getFaultFailureConnector().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__PART:
-				return !getPart().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__FAILURE:
-				return !getFailure().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__EXTERNAL_FAULT:
-				return !getExternalFault().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__INTERNAL_FAULT:
-				return !getInternalFault().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__PROCESS_FAULT:
-				return !getProcessFault().isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
-				return target != null && !target.isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
-				return hwTarget != null && !hwTarget.isEmpty();
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				return errorBehaviorDescription != null && !errorBehaviorDescription.isEmpty();
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
+			return base_Class != null;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
+			return GENERIC_DESCRIPTION_EDEFAULT == null ? genericDescription != null : !GENERIC_DESCRIPTION_EDEFAULT.equals(genericDescription);
+		case ErrormodelPackage.ERROR_MODEL_TYPE__FAULT_FAILURE_CONNECTOR:
+			return !getFaultFailureConnector().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__PART:
+			return !getPart().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__FAILURE:
+			return !getFailure().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__EXTERNAL_FAULT:
+			return !getExternalFault().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__INTERNAL_FAULT:
+			return !getInternalFault().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__PROCESS_FAULT:
+			return !getProcessFault().isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
+			return target != null && !target.isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
+			return hwTarget != null && !hwTarget.isEmpty();
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			return errorBehaviorDescription != null && !errorBehaviorDescription.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
-				setGenericDescription((String)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
-				getTarget().clear();
-				getTarget().addAll((Collection<? extends FunctionType>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
-				getHwTarget().clear();
-				getHwTarget().addAll((Collection<? extends HardwareComponentType>)newValue);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				getErrorBehaviorDescription().clear();
-				getErrorBehaviorDescription().addAll((Collection<? extends ErrorBehavior>)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
+			setGenericDescription((String)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
+			getTarget().clear();
+			getTarget().addAll((Collection<? extends FunctionType>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
+			getHwTarget().clear();
+			getHwTarget().addAll((Collection<? extends HardwareComponentType>)newValue);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			getErrorBehaviorDescription().clear();
+			getErrorBehaviorDescription().addAll((Collection<? extends ErrorBehavior>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -273,14 +286,15 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -290,6 +304,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -299,47 +314,50 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
-				setGenericDescription(GENERIC_DESCRIPTION_EDEFAULT);
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
-				getTarget().clear();
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
-				getHwTarget().clear();
-				return;
-			case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
-				getErrorBehaviorDescription().clear();
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.ERROR_MODEL_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION:
+			setGenericDescription(GENERIC_DESCRIPTION_EDEFAULT);
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__TARGET:
+			getTarget().clear();
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET:
+			getHwTarget().clear();
+			return;
+		case ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION:
+			getErrorBehaviorDescription().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ErrorBehavior> getErrorBehaviorDescription() {
-		if (errorBehaviorDescription == null) {
+		if(errorBehaviorDescription == null) {
 			errorBehaviorDescription = new EObjectWithInverseResolvingEList<ErrorBehavior>(ErrorBehavior.class, this, ErrormodelPackage.ERROR_MODEL_TYPE__ERROR_BEHAVIOR_DESCRIPTION, ErrormodelPackage.ERROR_BEHAVIOR__OWNER);
 		}
 		return errorBehaviorDescription;
@@ -389,7 +407,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 				Port currentPort = itDep.next();
 
 				// Test if currentPort is stereotyped FailureOutputPort
-				
+
 				currentFlowPort = (FailureOutPort)UMLUtil.getStereotypeApplication(currentPort, FailureOutPort.class);
 
 				if(currentFlowPort != null) {
@@ -418,9 +436,8 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 				Connector currentConnector = itDep.next();
 
 				// Test if currentConnector is stereotyped FaultFailurePropagationLink
-				
-			  currentConnectorPrototype = (FaultFailurePropagationLink)UMLUtil.getStereotypeApplication(currentConnector,
-						FaultFailurePropagationLink.class);
+
+				currentConnectorPrototype = (FaultFailurePropagationLink)UMLUtil.getStereotypeApplication(currentConnector, FaultFailurePropagationLink.class);
 
 				if(currentConnectorPrototype != null) {
 					connectors.add(currentConnectorPrototype);
@@ -429,12 +446,12 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 		}
 
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<FaultFailurePropagationLink>(FaultFailurePropagationLink.class,
-			connectors.size(), connectors.toArray());
+		return new BasicInternalEList<FaultFailurePropagationLink>(FaultFailurePropagationLink.class, connectors.size(), connectors.toArray());
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getGenericDescription() {
@@ -443,10 +460,11 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentType> getHwTarget() {
-		if (hwTarget == null) {
+		if(hwTarget == null) {
 			hwTarget = new EObjectResolvingEList<HardwareComponentType>(HardwareComponentType.class, this, ErrormodelPackage.ERROR_MODEL_TYPE__HW_TARGET);
 		}
 		return hwTarget;
@@ -468,10 +486,9 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 				Property currentProperty = itDep.next();
 
 				// Test if currentProperty is stereotyped InternalFaultPrototype
-				
-				currentFunctionPrototype = (InternalFaultPrototype)UMLUtil.getStereotypeApplication(currentProperty,
-						InternalFaultPrototype.class);
-				
+
+				currentFunctionPrototype = (InternalFaultPrototype)UMLUtil.getStereotypeApplication(currentProperty, InternalFaultPrototype.class);
+
 				if(currentFunctionPrototype != null) {
 					parts.add(currentFunctionPrototype);
 				}
@@ -479,8 +496,7 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 		}
 
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<InternalFaultPrototype>(InternalFaultPrototype.class, parts.size(), parts
-			.toArray());
+		return new BasicInternalEList<InternalFaultPrototype>(InternalFaultPrototype.class, parts.size(), parts.toArray());
 	}
 
 	/**
@@ -499,10 +515,9 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 				Property currentProperty = itDep.next();
 
 				// Test if currentProperty is stereotyped ErrorModelPrototype
-				
-				
-				currentFunctionPrototype = (ErrorModelPrototype)UMLUtil.getStereotypeApplication(currentProperty,
-						ErrorModelPrototype.class);
+
+
+				currentFunctionPrototype = (ErrorModelPrototype)UMLUtil.getStereotypeApplication(currentProperty, ErrorModelPrototype.class);
 
 				if(currentFunctionPrototype != null) {
 					parts.add(currentFunctionPrototype);
@@ -530,10 +545,9 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 				Property currentProperty = itDep.next();
 
 				// Test if currentProperty is stereotyped ADLFunctionPrototype
-				currentFunctionPrototype = (ProcessFaultPrototype)UMLUtil.getStereotypeApplication(currentProperty,
-					ProcessFaultPrototype.class);
-				
-				
+				currentFunctionPrototype = (ProcessFaultPrototype)UMLUtil.getStereotypeApplication(currentProperty, ProcessFaultPrototype.class);
+
+
 
 				if(currentFunctionPrototype != null) {
 					parts.add(currentFunctionPrototype);
@@ -547,10 +561,11 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionType> getTarget() {
-		if (target == null) {
+		if(target == null) {
 			target = new EObjectResolvingEList<FunctionType>(FunctionType.class, this, ErrormodelPackage.ERROR_MODEL_TYPE__TARGET);
 		}
 		return target;
@@ -558,22 +573,25 @@ public class ErrorModelTypeImpl extends TraceableSpecificationImpl implements Er
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGenericDescription(String newGenericDescription) {
 		String oldGenericDescription = genericDescription;
 		genericDescription = newGenericDescription;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.ERROR_MODEL_TYPE__GENERIC_DESCRIPTION, oldGenericDescription, genericDescription));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (genericDescription: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelFactoryImpl.java
index 95525a6c1f9..2e54fd2d59d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.dependability.errormodel.*;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehaviorKind;
@@ -39,12 +40,15 @@ import org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototyp
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -57,16 +61,16 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ErrormodelFactory init() {
 		try {
 			ErrormodelFactory theErrormodelFactory = (ErrormodelFactory)EPackage.Registry.INSTANCE.getEFactory(ErrormodelPackage.eNS_URI);
-			if (theErrormodelFactory != null) {
+			if(theErrormodelFactory != null) {
 				return theErrormodelFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ErrormodelFactoryImpl();
@@ -76,6 +80,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelFactoryImpl() {
@@ -85,6 +90,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertErrorBehaviorKindToString(EDataType eDataType, Object instanceValue) {
@@ -94,43 +100,55 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case ErrormodelPackage.ERROR_BEHAVIOR_KIND:
-				return convertErrorBehaviorKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case ErrormodelPackage.ERROR_BEHAVIOR_KIND:
+			return convertErrorBehaviorKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ErrormodelPackage.ERROR_BEHAVIOR: return createErrorBehavior();
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE: return createInternalFaultPrototype();
-			case ErrormodelPackage.ANOMALY: return createAnomaly();
-			case ErrormodelPackage.ERROR_MODEL_TYPE: return createErrorModelType();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK: return createFaultFailurePropagationLink();
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE: return createErrorModelPrototype();
-			case ErrormodelPackage.FAILURE_OUT_PORT: return createFailureOutPort();
-			case ErrormodelPackage.FAULT_IN_PORT: return createFaultInPort();
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE: return createProcessFaultPrototype();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case ErrormodelPackage.ERROR_BEHAVIOR:
+			return createErrorBehavior();
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE:
+			return createInternalFaultPrototype();
+		case ErrormodelPackage.ANOMALY:
+			return createAnomaly();
+		case ErrormodelPackage.ERROR_MODEL_TYPE:
+			return createErrorModelType();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK:
+			return createFaultFailurePropagationLink();
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE:
+			return createErrorModelPrototype();
+		case ErrormodelPackage.FAILURE_OUT_PORT:
+			return createFailureOutPort();
+		case ErrormodelPackage.FAULT_IN_PORT:
+			return createFaultInPort();
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE:
+			return createProcessFaultPrototype();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Anomaly createAnomaly() {
@@ -141,6 +159,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorBehavior createErrorBehavior() {
@@ -151,17 +170,20 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorBehaviorKind createErrorBehaviorKindFromString(EDataType eDataType, String initialValue) {
 		ErrorBehaviorKind result = ErrorBehaviorKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModelPrototype createErrorModelPrototype() {
@@ -172,6 +194,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModelType createErrorModelType() {
@@ -182,6 +205,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FailureOutPort createFailureOutPort() {
@@ -192,6 +216,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FaultFailurePropagationLink createFaultFailurePropagationLink() {
@@ -202,6 +227,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FaultInPort createFaultInPort() {
@@ -212,21 +238,23 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case ErrormodelPackage.ERROR_BEHAVIOR_KIND:
-				return createErrorBehaviorKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case ErrormodelPackage.ERROR_BEHAVIOR_KIND:
+			return createErrorBehaviorKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InternalFaultPrototype createInternalFaultPrototype() {
@@ -237,6 +265,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ProcessFaultPrototype createProcessFaultPrototype() {
@@ -247,6 +276,7 @@ public class ErrormodelFactoryImpl extends EFactoryImpl implements ErrormodelFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelPackage getErrormodelPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelPackageImpl.java
index f78709d09a7..e0479b88041 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ErrormodelPackageImpl.java
@@ -97,6 +97,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPackage {
@@ -104,6 +105,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass errorBehaviorEClass = null;
@@ -111,6 +113,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass anomalyEClass = null;
@@ -118,6 +121,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass internalFaultPrototypeEClass = null;
@@ -125,6 +129,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass errorModelTypeEClass = null;
@@ -132,6 +137,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass faultFailurePropagationLinkEClass = null;
@@ -139,6 +145,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass faultFailurePortEClass = null;
@@ -146,6 +153,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass errorModelPrototypeEClass = null;
@@ -153,6 +161,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass processFaultPrototypeEClass = null;
@@ -160,6 +169,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass failureOutPortEClass = null;
@@ -167,6 +177,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass faultInPortEClass = null;
@@ -174,6 +185,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum errorBehaviorKindEEnum = null;
@@ -181,6 +193,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -188,16 +201,18 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * 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 ErrormodelPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link ErrormodelPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static ErrormodelPackage init() {
-		if (isInited) return (ErrormodelPackage)EPackage.Registry.INSTANCE.getEPackage(ErrormodelPackage.eNS_URI);
+		if(isInited)
+			return (ErrormodelPackage)EPackage.Registry.INSTANCE.getEPackage(ErrormodelPackage.eNS_URI);
 
 		// Obtain or create and register package
 		ErrormodelPackageImpl theErrormodelPackage = (ErrormodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ErrormodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ErrormodelPackageImpl());
@@ -299,7 +314,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 		// Mark meta-data to indicate it can't be changed
 		theErrormodelPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(ErrormodelPackage.eNS_URI, theErrormodelPackage);
 		return theErrormodelPackage;
@@ -308,6 +323,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -315,19 +331,19 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage#eNS_URI
 	 * @see #init()
@@ -338,14 +354,16 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -419,6 +437,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAnomaly() {
@@ -428,6 +447,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAnomaly_GenericDescription() {
@@ -437,6 +457,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnomaly_Base_Property() {
@@ -446,6 +467,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnomaly_Type() {
@@ -455,6 +477,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getErrorBehavior() {
@@ -464,6 +487,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_Base_Behavior() {
@@ -473,6 +497,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_ExternalFailure() {
@@ -482,6 +507,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_ExternalFault() {
@@ -491,6 +517,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getErrorBehavior_FailureLogic() {
@@ -500,6 +527,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_InternalFault() {
@@ -509,6 +537,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_Owner() {
@@ -518,6 +547,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorBehavior_ProcessFault() {
@@ -527,6 +557,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getErrorBehavior_Type() {
@@ -536,6 +567,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getErrorBehaviorKind() {
@@ -545,6 +577,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelFactory getErrormodelFactory() {
@@ -554,6 +587,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getErrorModelPrototype() {
@@ -563,6 +597,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_Base_Property() {
@@ -572,6 +607,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_FunctionTarget() {
@@ -581,6 +617,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_HwTarget() {
@@ -590,6 +627,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_FunctionTarget_path() {
@@ -599,6 +637,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_HwTarget_path() {
@@ -608,6 +647,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_Target() {
@@ -617,6 +657,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelPrototype_Type() {
@@ -626,6 +667,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getErrorModelType() {
@@ -635,6 +677,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_Base_Class() {
@@ -644,6 +687,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_ErrorBehaviorDescription() {
@@ -653,6 +697,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_ExternalFault() {
@@ -662,6 +707,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_Failure() {
@@ -671,6 +717,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_FaultFailureConnector() {
@@ -680,6 +727,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getErrorModelType_GenericDescription() {
@@ -689,6 +737,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_HwTarget() {
@@ -698,6 +747,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_InternalFault() {
@@ -707,6 +757,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_Part() {
@@ -716,6 +767,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_ProcessFault() {
@@ -725,6 +777,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getErrorModelType_Target() {
@@ -734,6 +787,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFailureOutPort() {
@@ -743,6 +797,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFaultFailurePort() {
@@ -752,6 +807,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePort_Base_Port() {
@@ -761,6 +817,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePort_FunctionTarget() {
@@ -770,6 +827,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePort_HwTarget() {
@@ -779,6 +837,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePort_FunctionTarget_path() {
@@ -788,6 +847,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePort_HwTarget_path() {
@@ -797,6 +857,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFaultFailurePropagationLink() {
@@ -806,6 +867,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePropagationLink_Base_Connector() {
@@ -815,6 +877,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePropagationLink_FromPort() {
@@ -824,6 +887,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePropagationLink_FromPort_path() {
@@ -833,6 +897,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePropagationLink_ToPort_path() {
@@ -842,6 +907,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFaultFailurePropagationLink_ImmediatePropagation() {
@@ -851,6 +917,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailurePropagationLink_ToPort() {
@@ -860,6 +927,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFaultInPort() {
@@ -869,6 +937,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getInternalFaultPrototype() {
@@ -878,6 +947,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getInternalFaultPrototype_Base_Class() {
@@ -887,6 +957,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getInternalFaultPrototype_Base_Event() {
@@ -896,6 +967,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getProcessFaultPrototype() {
@@ -905,6 +977,7 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getProcessFaultPrototype_Base_Event() {
@@ -912,14 +985,16 @@ public class ErrormodelPackageImpl extends EPackageImpl implements ErrormodelPac
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FailureOutPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FailureOutPortImpl.java
index b641155a894..ca7c97187c9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FailureOutPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FailureOutPortImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class FailureOutPortImpl extends FaultFailurePortImpl implements FailureOutPort {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FailureOutPortImpl() {
@@ -42,6 +44,7 @@ public class FailureOutPortImpl extends FaultFailurePortImpl implements FailureO
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePortImpl.java
index ad3dbe7c30b..d4a645890c1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePortImpl.java
@@ -39,21 +39,23 @@ import org.eclipse.uml2.uml.Port;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getFunctionTarget <em>Function Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getHwTarget <em>Hw Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getFunctionTarget_path <em>Function Target path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getHwTarget_path <em>Hw Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getFunctionTarget <em>Function Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getHwTarget <em>Hw Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getFunctionTarget_path <em>Function Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePortImpl#getHwTarget_path <em>Hw Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultFailurePort {
+
 	/**
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	 * The cached value of the '{@link #getFunctionTarget() <em>Function Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionTarget()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	 * The cached value of the '{@link #getHwTarget() <em>Hw Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHwTarget()
 	 * @generated
 	 * @ordered
@@ -84,6 +88,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	 * The cached value of the '{@link #getFunctionTarget_path() <em>Function Target path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionTarget_path()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	 * The cached value of the '{@link #getHwTarget_path() <em>Hw Target path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHwTarget_path()
 	 * @generated
 	 * @ordered
@@ -103,6 +109,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FaultFailurePortImpl() {
@@ -112,22 +119,24 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
-				return getFunctionTarget();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
-				return getHwTarget();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
-				return getFunctionTarget_path();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
-				return getHwTarget_path();
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
+			return getFunctionTarget();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
+			return getHwTarget();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
+			return getFunctionTarget_path();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
+			return getHwTarget_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -135,21 +144,22 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
-				return base_Port != null;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
-				return functionTarget != null && !functionTarget.isEmpty();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
-				return hwTarget != null && !hwTarget.isEmpty();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
-				return functionTarget_path != null && !functionTarget_path.isEmpty();
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
-				return hwTarget_path != null && !hwTarget_path.isEmpty();
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
+			return base_Port != null;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
+			return functionTarget != null && !functionTarget.isEmpty();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
+			return hwTarget != null && !hwTarget.isEmpty();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
+			return functionTarget_path != null && !functionTarget_path.isEmpty();
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
+			return hwTarget_path != null && !hwTarget_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -157,31 +167,32 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
-				getFunctionTarget().clear();
-				getFunctionTarget().addAll((Collection<? extends FunctionPort>)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
-				getHwTarget().clear();
-				getHwTarget().addAll((Collection<? extends HardwarePin>)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
-				getFunctionTarget_path().clear();
-				getFunctionTarget_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
-				getHwTarget_path().clear();
-				getHwTarget_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
+			getFunctionTarget().clear();
+			getFunctionTarget().addAll((Collection<? extends FunctionPort>)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
+			getHwTarget().clear();
+			getHwTarget().addAll((Collection<? extends HardwarePin>)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
+			getFunctionTarget_path().clear();
+			getFunctionTarget_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
+			getHwTarget_path().clear();
+			getHwTarget_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -189,6 +200,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,14 +211,15 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -216,6 +229,7 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -225,38 +239,40 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
-				getFunctionTarget().clear();
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
-				getHwTarget().clear();
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
-				getFunctionTarget_path().clear();
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
-				getHwTarget_path().clear();
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PORT__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET:
+			getFunctionTarget().clear();
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET:
+			getHwTarget().clear();
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH:
+			getFunctionTarget_path().clear();
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH:
+			getHwTarget_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -264,10 +280,11 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPort> getFunctionTarget() {
-		if (functionTarget == null) {
+		if(functionTarget == null) {
 			functionTarget = new EObjectResolvingEList<FunctionPort>(FunctionPort.class, this, ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET);
 		}
 		return functionTarget;
@@ -276,10 +293,11 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwarePin> getHwTarget() {
-		if (hwTarget == null) {
+		if(hwTarget == null) {
 			hwTarget = new EObjectResolvingEList<HardwarePin>(HardwarePin.class, this, ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET);
 		}
 		return hwTarget;
@@ -288,10 +306,11 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getFunctionTarget_path() {
-		if (functionTarget_path == null) {
+		if(functionTarget_path == null) {
 			functionTarget_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, ErrormodelPackage.FAULT_FAILURE_PORT__FUNCTION_TARGET_PATH);
 		}
 		return functionTarget_path;
@@ -300,10 +319,11 @@ public abstract class FaultFailurePortImpl extends AnomalyImpl implements FaultF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getHwTarget_path() {
-		if (hwTarget_path == null) {
+		if(hwTarget_path == null) {
 			hwTarget_path = new EObjectResolvingEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, ErrormodelPackage.FAULT_FAILURE_PORT__HW_TARGET_PATH);
 		}
 		return hwTarget_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePropagationLinkImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePropagationLinkImpl.java
index 106a993d87f..69d03af1d4d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePropagationLinkImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultFailurePropagationLinkImpl.java
@@ -39,15 +39,16 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#isImmediatePropagation <em>Immediate Propagation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getToPort <em>To Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getFromPort <em>From Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getFromPort_path <em>From Port path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getToPort_path <em>To Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#isImmediatePropagation <em>Immediate
+ * Propagation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getToPort <em>To Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getFromPort <em>From Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getFromPort_path <em>From Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.FaultFailurePropagationLinkImpl#getToPort_path <em>To Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FaultFailurePropagationLinkImpl extends EAElementImpl implements FaultFailurePropagationLink {
@@ -56,6 +57,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Connector()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * The default value of the '{@link #isImmediatePropagation() <em>Immediate Propagation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isImmediatePropagation()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * The cached value of the '{@link #isImmediatePropagation() <em>Immediate Propagation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isImmediatePropagation()
 	 * @generated
 	 * @ordered
@@ -84,6 +88,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	 * The cached value of the '{@link #getFromPort_path() <em>From Port path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFromPort_path()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	 * The cached value of the '{@link #getToPort_path() <em>To Port path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getToPort_path()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FaultFailurePropagationLinkImpl() {
@@ -124,8 +131,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 				if((ce != null) && (ce instanceof Port)) {
 					// Test if ConnectableElement ce is FaultFailurePort
-					currentFlowPort = (FaultFailurePort)UMLUtil.getStereotypeApplication(ce, 
-						FaultFailurePort.class);
+					currentFlowPort = (FaultFailurePort)UMLUtil.getStereotypeApplication(ce, FaultFailurePort.class);
 				}
 			}
 		}
@@ -135,10 +141,11 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ErrorModelPrototype> getFromPort_path() {
-		if (fromPort_path == null) {
+		if(fromPort_path == null) {
 			fromPort_path = new EObjectResolvingEList<ErrorModelPrototype>(ErrorModelPrototype.class, this, ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH);
 		}
 		return fromPort_path;
@@ -147,10 +154,11 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ErrorModelPrototype> getToPort_path() {
-		if (toPort_path == null) {
+		if(toPort_path == null) {
 			toPort_path = new EObjectResolvingEList<ErrorModelPrototype>(ErrorModelPrototype.class, this, ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH);
 		}
 		return toPort_path;
@@ -181,81 +189,88 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
-				if (resolve) return getBase_Connector();
-				return basicGetBase_Connector();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
-				return isImmediatePropagation();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT:
-				if (resolve) return getToPort();
-				return basicGetToPort();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT:
-				if (resolve) return getFromPort();
-				return basicGetFromPort();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
-				return getFromPort_path();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
-				return getToPort_path();
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
+			if(resolve)
+				return getBase_Connector();
+			return basicGetBase_Connector();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
+			return isImmediatePropagation();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT:
+			if(resolve)
+				return getToPort();
+			return basicGetToPort();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT:
+			if(resolve)
+				return getFromPort();
+			return basicGetFromPort();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
+			return getFromPort_path();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
+			return getToPort_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
-				return base_Connector != null;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
-				return immediatePropagation != IMMEDIATE_PROPAGATION_EDEFAULT;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT:
-				return basicGetToPort() != null;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT:
-				return basicGetFromPort() != null;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
-				return fromPort_path != null && !fromPort_path.isEmpty();
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
-				return toPort_path != null && !toPort_path.isEmpty();
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
+			return base_Connector != null;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
+			return immediatePropagation != IMMEDIATE_PROPAGATION_EDEFAULT;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT:
+			return basicGetToPort() != null;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT:
+			return basicGetFromPort() != null;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
+			return fromPort_path != null && !fromPort_path.isEmpty();
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
+			return toPort_path != null && !toPort_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
-				setBase_Connector((Connector)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
-				setImmediatePropagation((Boolean)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
-				getFromPort_path().clear();
-				getFromPort_path().addAll((Collection<? extends ErrorModelPrototype>)newValue);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
-				getToPort_path().clear();
-				getToPort_path().addAll((Collection<? extends ErrorModelPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
+			setBase_Connector((Connector)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
+			setImmediatePropagation((Boolean)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
+			getFromPort_path().clear();
+			getFromPort_path().addAll((Collection<? extends ErrorModelPrototype>)newValue);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
+			getToPort_path().clear();
+			getToPort_path().addAll((Collection<? extends ErrorModelPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,14 +281,15 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector getBase_Connector() {
-		if (base_Connector != null && base_Connector.eIsProxy()) {
+		if(base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
 			base_Connector = (Connector)eResolveProxy(oldBase_Connector);
-			if (base_Connector != oldBase_Connector) {
-				if (eNotificationRequired())
+			if(base_Connector != oldBase_Connector) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 			}
 		}
@@ -283,6 +299,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector basicGetBase_Connector() {
@@ -292,40 +309,43 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
-				setBase_Connector((Connector)null);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
-				setImmediatePropagation(IMMEDIATE_PROPAGATION_EDEFAULT);
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
-				getFromPort_path().clear();
-				return;
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
-				getToPort_path().clear();
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__BASE_CONNECTOR:
+			setBase_Connector((Connector)null);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION:
+			setImmediatePropagation(IMMEDIATE_PROPAGATION_EDEFAULT);
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__FROM_PORT_PATH:
+			getFromPort_path().clear();
+			return;
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__TO_PORT_PATH:
+			getToPort_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FaultFailurePort getFromPort() {
@@ -335,6 +355,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FaultFailurePort getToPort() {
@@ -344,6 +365,7 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isImmediatePropagation() {
@@ -352,22 +374,25 @@ public class FaultFailurePropagationLinkImpl extends EAElementImpl implements Fa
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImmediatePropagation(boolean newImmediatePropagation) {
 		boolean oldImmediatePropagation = immediatePropagation;
 		immediatePropagation = newImmediatePropagation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK__IMMEDIATE_PROPAGATION, oldImmediatePropagation, immediatePropagation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (immediatePropagation: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultInPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultInPortImpl.java
index 511c2f1bcfd..b111af6a97b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultInPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/FaultInPortImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class FaultInPortImpl extends FaultFailurePortImpl implements FaultInPort {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FaultInPortImpl() {
@@ -42,6 +44,7 @@ public class FaultInPortImpl extends FaultFailurePortImpl implements FaultInPort
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/InternalFaultPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/InternalFaultPrototypeImpl.java
index 7363fc30f5e..45dc1580f26 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/InternalFaultPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/InternalFaultPrototypeImpl.java
@@ -31,18 +31,20 @@ import org.eclipse.uml2.uml.Event;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl#getBase_Event <em>Base Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.InternalFaultPrototypeImpl#getBase_Event <em>Base Event</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalFaultPrototype {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -53,6 +55,7 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	 * The cached value of the '{@link #getBase_Event() <em>Base Event</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Event()
 	 * @generated
 	 * @ordered
@@ -62,6 +65,7 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected InternalFaultPrototypeImpl() {
@@ -71,17 +75,20 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
-				if (resolve) return getBase_Event();
-				return basicGetBase_Event();
+		switch(featureID) {
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
+			if(resolve)
+				return getBase_Event();
+			return basicGetBase_Event();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -89,15 +96,16 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
-				return base_Class != null;
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
-				return base_Event != null;
+		switch(featureID) {
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
+			return base_Class != null;
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
+			return base_Event != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -105,17 +113,18 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
-				setBase_Event((Event)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
+			setBase_Event((Event)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -123,6 +132,7 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,14 +143,15 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -150,6 +161,7 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -159,26 +171,28 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event getBase_Event() {
-		if (base_Event != null && base_Event.eIsProxy()) {
+		if(base_Event != null && base_Event.eIsProxy()) {
 			InternalEObject oldBase_Event = (InternalEObject)base_Event;
 			base_Event = (Event)eResolveProxy(oldBase_Event);
-			if (base_Event != oldBase_Event) {
-				if (eNotificationRequired())
+			if(base_Event != oldBase_Event) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT, oldBase_Event, base_Event));
 			}
 		}
@@ -188,6 +202,7 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event basicGetBase_Event() {
@@ -197,29 +212,31 @@ public class InternalFaultPrototypeImpl extends AnomalyImpl implements InternalF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Event(Event newBase_Event) {
 		Event oldBase_Event = base_Event;
 		base_Event = newBase_Event;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT, oldBase_Event, base_Event));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
-				setBase_Event((Event)null);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE__BASE_EVENT:
+			setBase_Event((Event)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ProcessFaultPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ProcessFaultPrototypeImpl.java
index 9e3b1f7b2bb..ae5f0502ca9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ProcessFaultPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/impl/ProcessFaultPrototypeImpl.java
@@ -31,25 +31,29 @@ import org.eclipse.uml2.uml.Event;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl#getBase_Event <em>Base Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.errormodel.impl.ProcessFaultPrototypeImpl#getBase_Event <em>Base Event</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFaultPrototype {
+
 	/**
 	 * The cached value of the '{@link #getBase_Event() <em>Base Event</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Event()
 	 * @generated
 	 * @ordered
 	 */
 	protected Event base_Event;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProcessFaultPrototypeImpl() {
@@ -59,14 +63,16 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
-				if (resolve) return getBase_Event();
-				return basicGetBase_Event();
+		switch(featureID) {
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
+			if(resolve)
+				return getBase_Event();
+			return basicGetBase_Event();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -74,13 +80,14 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
-				return base_Event != null;
+		switch(featureID) {
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
+			return base_Event != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -88,14 +95,15 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
-				setBase_Event((Event)newValue);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
+			setBase_Event((Event)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -103,6 +111,7 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,14 +122,15 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event getBase_Event() {
-		if (base_Event != null && base_Event.eIsProxy()) {
+		if(base_Event != null && base_Event.eIsProxy()) {
 			InternalEObject oldBase_Event = (InternalEObject)base_Event;
 			base_Event = (Event)eResolveProxy(oldBase_Event);
-			if (base_Event != oldBase_Event) {
-				if (eNotificationRequired())
+			if(base_Event != oldBase_Event) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT, oldBase_Event, base_Event));
 			}
 		}
@@ -130,6 +140,7 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event basicGetBase_Event() {
@@ -139,26 +150,28 @@ public class ProcessFaultPrototypeImpl extends AnomalyImpl implements ProcessFau
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Event(Event newBase_Event) {
 		Event oldBase_Event = base_Event;
 		base_Event = newBase_Event;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT, oldBase_Event, base_Event));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
-				setBase_Event((Event)null);
-				return;
+		switch(featureID) {
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE__BASE_EVENT:
+			setBase_Event((Event)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelAdapterFactory.java
index 1fc9054e57d..a87059b512b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.dependability.errormodel.*;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype;
@@ -40,14 +41,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage
  * @generated
  */
 public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ErrormodelPackage modelPackage;
@@ -56,76 +60,91 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected ErrormodelSwitch<Adapter> modelSwitch =
-		new ErrormodelSwitch<Adapter>() {
-			@Override
-			public Adapter caseErrorBehavior(ErrorBehavior object) {
-				return createErrorBehaviorAdapter();
-			}
-			@Override
-			public Adapter caseInternalFaultPrototype(InternalFaultPrototype object) {
-				return createInternalFaultPrototypeAdapter();
-			}
-			@Override
-			public Adapter caseAnomaly(Anomaly object) {
-				return createAnomalyAdapter();
-			}
-			@Override
-			public Adapter caseErrorModelType(ErrorModelType object) {
-				return createErrorModelTypeAdapter();
-			}
-			@Override
-			public Adapter caseFaultFailurePropagationLink(FaultFailurePropagationLink object) {
-				return createFaultFailurePropagationLinkAdapter();
-			}
-			@Override
-			public Adapter caseFaultFailurePort(FaultFailurePort object) {
-				return createFaultFailurePortAdapter();
-			}
-			@Override
-			public Adapter caseErrorModelPrototype(ErrorModelPrototype object) {
-				return createErrorModelPrototypeAdapter();
-			}
-			@Override
-			public Adapter caseFailureOutPort(FailureOutPort object) {
-				return createFailureOutPortAdapter();
-			}
-			@Override
-			public Adapter caseFaultInPort(FaultInPort object) {
-				return createFaultInPortAdapter();
-			}
-			@Override
-			public Adapter caseProcessFaultPrototype(ProcessFaultPrototype object) {
-				return createProcessFaultPrototypeAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected ErrormodelSwitch<Adapter> modelSwitch = new ErrormodelSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseErrorBehavior(ErrorBehavior object) {
+			return createErrorBehaviorAdapter();
+		}
+
+		@Override
+		public Adapter caseInternalFaultPrototype(InternalFaultPrototype object) {
+			return createInternalFaultPrototypeAdapter();
+		}
+
+		@Override
+		public Adapter caseAnomaly(Anomaly object) {
+			return createAnomalyAdapter();
+		}
+
+		@Override
+		public Adapter caseErrorModelType(ErrorModelType object) {
+			return createErrorModelTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseFaultFailurePropagationLink(FaultFailurePropagationLink object) {
+			return createFaultFailurePropagationLinkAdapter();
+		}
+
+		@Override
+		public Adapter caseFaultFailurePort(FaultFailurePort object) {
+			return createFaultFailurePortAdapter();
+		}
+
+		@Override
+		public Adapter caseErrorModelPrototype(ErrorModelPrototype object) {
+			return createErrorModelPrototypeAdapter();
+		}
+
+		@Override
+		public Adapter caseFailureOutPort(FailureOutPort object) {
+			return createFailureOutPortAdapter();
+		}
+
+		@Override
+		public Adapter caseFaultInPort(FaultInPort object) {
+			return createFaultInPortAdapter();
+		}
+
+		@Override
+		public Adapter caseProcessFaultPrototype(ProcessFaultPrototype object) {
+			return createProcessFaultPrototypeAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = ErrormodelPackage.eINSTANCE;
 		}
 	}
@@ -134,7 +153,9 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -149,6 +170,7 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly
 	 * @generated
@@ -162,6 +184,7 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -170,11 +193,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior <em>Error Behavior</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior
+	 * <em>Error Behavior</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior
 	 * @generated
@@ -184,11 +209,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype <em>Error Model Prototype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype
+	 * <em>Error Model Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype
 	 * @generated
@@ -198,11 +225,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType <em>Error Model Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType
+	 * <em>Error Model Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelType
 	 * @generated
@@ -212,11 +241,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort <em>Failure Out Port</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort
+	 * <em>Failure Out Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FailureOutPort
 	 * @generated
@@ -226,11 +257,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort <em>Fault Failure Port</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort
+	 * <em>Fault Failure Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePort
 	 * @generated
@@ -240,11 +273,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink <em>Fault Failure Propagation Link</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink
+	 * <em>Fault Failure Propagation Link</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultFailurePropagationLink
 	 * @generated
@@ -259,6 +294,7 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.FaultInPort
 	 * @generated
@@ -268,11 +304,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype <em>Internal Fault Prototype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype
+	 * <em>Internal Fault Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.InternalFaultPrototype
 	 * @generated
@@ -282,11 +320,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype <em>Process Fault Prototype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype
+	 * <em>Process Fault Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ProcessFaultPrototype
 	 * @generated
@@ -301,6 +341,7 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -310,11 +351,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -324,11 +367,13 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -342,15 +387,16 @@ public class ErrormodelAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceFactoryImpl.java
index 7d5f7ed8f45..f6a128f438f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.util.ErrormodelResourceImpl
  * @generated
  */
 public class ErrormodelResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class ErrormodelResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceImpl.java
index ffb73db7604..0f7a7f70e36 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.util.ErrormodelResourceFactoryImpl
  * @generated
  */
 public class ErrormodelResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public ErrormodelResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelSwitch.java
index b08eefa2fb2..e3952b7b422 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.dependability.errormodel.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.dependability.errormodel.*;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.Anomaly;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorBehavior;
 import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrorModelPrototype;
@@ -37,21 +38,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage
  * @generated
  */
 public class ErrormodelSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ErrormodelPackage modelPackage;
@@ -60,10 +63,11 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = ErrormodelPackage.eINSTANCE;
 		}
 	}
@@ -72,6 +76,7 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -87,7 +92,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Anomaly</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -102,7 +109,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Error Behavior</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -117,7 +126,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Error Model Prototype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -132,7 +143,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Error Model Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -147,7 +160,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Failure Out Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -162,7 +177,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Fault Failure Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -177,7 +194,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Fault Failure Propagation Link</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -192,7 +211,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Fault In Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -207,7 +228,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Internal Fault Prototype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -222,7 +245,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Process Fault Prototype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -237,7 +262,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -252,7 +279,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -267,7 +296,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -282,7 +313,9 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -296,92 +329,133 @@ public class ErrormodelSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ErrormodelPackage.ERROR_BEHAVIOR: {
-				ErrorBehavior errorBehavior = (ErrorBehavior)theEObject;
-				T result = caseErrorBehavior(errorBehavior);
-				if (result == null) result = caseEAElement(errorBehavior);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE: {
-				InternalFaultPrototype internalFaultPrototype = (InternalFaultPrototype)theEObject;
-				T result = caseInternalFaultPrototype(internalFaultPrototype);
-				if (result == null) result = caseAnomaly(internalFaultPrototype);
-				if (result == null) result = caseEAElement(internalFaultPrototype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.ANOMALY: {
-				Anomaly anomaly = (Anomaly)theEObject;
-				T result = caseAnomaly(anomaly);
-				if (result == null) result = caseEAElement(anomaly);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.ERROR_MODEL_TYPE: {
-				ErrorModelType errorModelType = (ErrorModelType)theEObject;
-				T result = caseErrorModelType(errorModelType);
-				if (result == null) result = caseTraceableSpecification(errorModelType);
-				if (result == null) result = caseEAPackageableElement(errorModelType);
-				if (result == null) result = caseEAElement(errorModelType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK: {
-				FaultFailurePropagationLink faultFailurePropagationLink = (FaultFailurePropagationLink)theEObject;
-				T result = caseFaultFailurePropagationLink(faultFailurePropagationLink);
-				if (result == null) result = caseEAElement(faultFailurePropagationLink);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.FAULT_FAILURE_PORT: {
-				FaultFailurePort faultFailurePort = (FaultFailurePort)theEObject;
-				T result = caseFaultFailurePort(faultFailurePort);
-				if (result == null) result = caseAnomaly(faultFailurePort);
-				if (result == null) result = caseEAElement(faultFailurePort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.ERROR_MODEL_PROTOTYPE: {
-				ErrorModelPrototype errorModelPrototype = (ErrorModelPrototype)theEObject;
-				T result = caseErrorModelPrototype(errorModelPrototype);
-				if (result == null) result = caseEAElement(errorModelPrototype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.FAILURE_OUT_PORT: {
-				FailureOutPort failureOutPort = (FailureOutPort)theEObject;
-				T result = caseFailureOutPort(failureOutPort);
-				if (result == null) result = caseFaultFailurePort(failureOutPort);
-				if (result == null) result = caseAnomaly(failureOutPort);
-				if (result == null) result = caseEAElement(failureOutPort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.FAULT_IN_PORT: {
-				FaultInPort faultInPort = (FaultInPort)theEObject;
-				T result = caseFaultInPort(faultInPort);
-				if (result == null) result = caseFaultFailurePort(faultInPort);
-				if (result == null) result = caseAnomaly(faultInPort);
-				if (result == null) result = caseEAElement(faultInPort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE: {
-				ProcessFaultPrototype processFaultPrototype = (ProcessFaultPrototype)theEObject;
-				T result = caseProcessFaultPrototype(processFaultPrototype);
-				if (result == null) result = caseAnomaly(processFaultPrototype);
-				if (result == null) result = caseEAElement(processFaultPrototype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case ErrormodelPackage.ERROR_BEHAVIOR:
+		{
+			ErrorBehavior errorBehavior = (ErrorBehavior)theEObject;
+			T result = caseErrorBehavior(errorBehavior);
+			if(result == null)
+				result = caseEAElement(errorBehavior);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.INTERNAL_FAULT_PROTOTYPE:
+		{
+			InternalFaultPrototype internalFaultPrototype = (InternalFaultPrototype)theEObject;
+			T result = caseInternalFaultPrototype(internalFaultPrototype);
+			if(result == null)
+				result = caseAnomaly(internalFaultPrototype);
+			if(result == null)
+				result = caseEAElement(internalFaultPrototype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.ANOMALY:
+		{
+			Anomaly anomaly = (Anomaly)theEObject;
+			T result = caseAnomaly(anomaly);
+			if(result == null)
+				result = caseEAElement(anomaly);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.ERROR_MODEL_TYPE:
+		{
+			ErrorModelType errorModelType = (ErrorModelType)theEObject;
+			T result = caseErrorModelType(errorModelType);
+			if(result == null)
+				result = caseTraceableSpecification(errorModelType);
+			if(result == null)
+				result = caseEAPackageableElement(errorModelType);
+			if(result == null)
+				result = caseEAElement(errorModelType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.FAULT_FAILURE_PROPAGATION_LINK:
+		{
+			FaultFailurePropagationLink faultFailurePropagationLink = (FaultFailurePropagationLink)theEObject;
+			T result = caseFaultFailurePropagationLink(faultFailurePropagationLink);
+			if(result == null)
+				result = caseEAElement(faultFailurePropagationLink);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.FAULT_FAILURE_PORT:
+		{
+			FaultFailurePort faultFailurePort = (FaultFailurePort)theEObject;
+			T result = caseFaultFailurePort(faultFailurePort);
+			if(result == null)
+				result = caseAnomaly(faultFailurePort);
+			if(result == null)
+				result = caseEAElement(faultFailurePort);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.ERROR_MODEL_PROTOTYPE:
+		{
+			ErrorModelPrototype errorModelPrototype = (ErrorModelPrototype)theEObject;
+			T result = caseErrorModelPrototype(errorModelPrototype);
+			if(result == null)
+				result = caseEAElement(errorModelPrototype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.FAILURE_OUT_PORT:
+		{
+			FailureOutPort failureOutPort = (FailureOutPort)theEObject;
+			T result = caseFailureOutPort(failureOutPort);
+			if(result == null)
+				result = caseFaultFailurePort(failureOutPort);
+			if(result == null)
+				result = caseAnomaly(failureOutPort);
+			if(result == null)
+				result = caseEAElement(failureOutPort);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.FAULT_IN_PORT:
+		{
+			FaultInPort faultInPort = (FaultInPort)theEObject;
+			T result = caseFaultInPort(faultInPort);
+			if(result == null)
+				result = caseFaultFailurePort(faultInPort);
+			if(result == null)
+				result = caseAnomaly(faultInPort);
+			if(result == null)
+				result = caseEAElement(faultInPort);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ErrormodelPackage.PROCESS_FAULT_PROTOTYPE:
+		{
+			ProcessFaultPrototype processFaultPrototype = (ProcessFaultPrototype)theEObject;
+			T result = caseProcessFaultPrototype(processFaultPrototype);
+			if(result == null)
+				result = caseAnomaly(processFaultPrototype);
+			if(result == null)
+				result = caseEAElement(processFaultPrototype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelXMLProcessor.java
index 4a57737adeb..68ce4b7256c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/errormodel/util/ErrormodelXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.dependability.errormodel.ErrormodelPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrormodelXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class ErrormodelXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrormodelXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		ErrormodelPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the ErrormodelResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new ErrormodelResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new ErrormodelResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityFactoryImpl.java
index f8d35629974..357e0eefa41 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.dependability.*;
 import org.eclipse.papyrus.eastadl.dependability.ControllabilityClassKind;
 import org.eclipse.papyrus.eastadl.dependability.Dependability;
 import org.eclipse.papyrus.eastadl.dependability.DependabilityFactory;
@@ -38,12 +39,15 @@ import org.eclipse.papyrus.eastadl.dependability.SeverityClassKind;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DependabilityFactoryImpl extends EFactoryImpl implements DependabilityFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -56,16 +60,16 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DependabilityFactory init() {
 		try {
 			DependabilityFactory theDependabilityFactory = (DependabilityFactory)EPackage.Registry.INSTANCE.getEFactory(DependabilityPackage.eNS_URI);
-			if (theDependabilityFactory != null) {
+			if(theDependabilityFactory != null) {
 				return theDependabilityFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DependabilityFactoryImpl();
@@ -75,6 +79,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DependabilityFactoryImpl() {
@@ -84,6 +89,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertControllabilityClassKindToString(EDataType eDataType, Object instanceValue) {
@@ -93,6 +99,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDevelopmentCategoryKindToString(EDataType eDataType, Object instanceValue) {
@@ -102,6 +109,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertExposureClassKindToString(EDataType eDataType, Object instanceValue) {
@@ -111,6 +119,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertSeverityClassKindToString(EDataType eDataType, Object instanceValue) {
@@ -120,56 +129,66 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case DependabilityPackage.CONTROLLABILITY_CLASS_KIND:
-				return convertControllabilityClassKindToString(eDataType, instanceValue);
-			case DependabilityPackage.EXPOSURE_CLASS_KIND:
-				return convertExposureClassKindToString(eDataType, instanceValue);
-			case DependabilityPackage.SEVERITY_CLASS_KIND:
-				return convertSeverityClassKindToString(eDataType, instanceValue);
-			case DependabilityPackage.DEVELOPMENT_CATEGORY_KIND:
-				return convertDevelopmentCategoryKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DependabilityPackage.CONTROLLABILITY_CLASS_KIND:
+			return convertControllabilityClassKindToString(eDataType, instanceValue);
+		case DependabilityPackage.EXPOSURE_CLASS_KIND:
+			return convertExposureClassKindToString(eDataType, instanceValue);
+		case DependabilityPackage.SEVERITY_CLASS_KIND:
+			return convertSeverityClassKindToString(eDataType, instanceValue);
+		case DependabilityPackage.DEVELOPMENT_CATEGORY_KIND:
+			return convertDevelopmentCategoryKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DependabilityPackage.HAZARDOUS_EVENT: return createHazardousEvent();
-			case DependabilityPackage.HAZARD: return createHazard();
-			case DependabilityPackage.FEATURE_FLAW: return createFeatureFlaw();
-			case DependabilityPackage.ITEM: return createItem();
-			case DependabilityPackage.DEPENDABILITY: return createDependability();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case DependabilityPackage.HAZARDOUS_EVENT:
+			return createHazardousEvent();
+		case DependabilityPackage.HAZARD:
+			return createHazard();
+		case DependabilityPackage.FEATURE_FLAW:
+			return createFeatureFlaw();
+		case DependabilityPackage.ITEM:
+			return createItem();
+		case DependabilityPackage.DEPENDABILITY:
+			return createDependability();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ControllabilityClassKind createControllabilityClassKindFromString(EDataType eDataType, String initialValue) {
 		ControllabilityClassKind result = ControllabilityClassKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependability createDependability() {
@@ -180,28 +199,33 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DevelopmentCategoryKind createDevelopmentCategoryKindFromString(EDataType eDataType, String initialValue) {
 		DevelopmentCategoryKind result = DevelopmentCategoryKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ExposureClassKind createExposureClassKindFromString(EDataType eDataType, String initialValue) {
 		ExposureClassKind result = ExposureClassKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureFlaw createFeatureFlaw() {
@@ -212,27 +236,29 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case DependabilityPackage.CONTROLLABILITY_CLASS_KIND:
-				return createControllabilityClassKindFromString(eDataType, initialValue);
-			case DependabilityPackage.EXPOSURE_CLASS_KIND:
-				return createExposureClassKindFromString(eDataType, initialValue);
-			case DependabilityPackage.SEVERITY_CLASS_KIND:
-				return createSeverityClassKindFromString(eDataType, initialValue);
-			case DependabilityPackage.DEVELOPMENT_CATEGORY_KIND:
-				return createDevelopmentCategoryKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DependabilityPackage.CONTROLLABILITY_CLASS_KIND:
+			return createControllabilityClassKindFromString(eDataType, initialValue);
+		case DependabilityPackage.EXPOSURE_CLASS_KIND:
+			return createExposureClassKindFromString(eDataType, initialValue);
+		case DependabilityPackage.SEVERITY_CLASS_KIND:
+			return createSeverityClassKindFromString(eDataType, initialValue);
+		case DependabilityPackage.DEVELOPMENT_CATEGORY_KIND:
+			return createDevelopmentCategoryKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Hazard createHazard() {
@@ -243,6 +269,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HazardousEvent createHazardousEvent() {
@@ -253,6 +280,7 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Item createItem() {
@@ -263,17 +291,20 @@ public class DependabilityFactoryImpl extends EFactoryImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SeverityClassKind createSeverityClassKindFromString(EDataType eDataType, String initialValue) {
 		SeverityClassKind result = SeverityClassKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DependabilityPackage getDependabilityPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityImpl.java
index 4506b2cd723..3e125bc145f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityImpl.java
@@ -47,30 +47,33 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFunctionalSafetyConcept <em>Functional Safety Concept</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyGoal <em>Safety Goal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getTechnicalSafetyConcept <em>Technical Safety Concept</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getHazardousEvent <em>Hazardous Event</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFeatureFlaw <em>Feature Flaw</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getItem <em>Item</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getEADatatype <em>EA Datatype</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFaultFailure <em>Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getQuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyConstraint <em>Safety Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyCase <em>Safety Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getErrorModelType <em>Error Model Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFunctionalSafetyConcept <em>Functional Safety Concept</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyGoal <em>Safety Goal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getTechnicalSafetyConcept <em>Technical Safety Concept</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getHazardousEvent <em>Hazardous Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFeatureFlaw <em>Feature Flaw</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getEADatatype <em>EA Datatype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getFaultFailure <em>Fault Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getQuantitativeSafetyConstraint <em>Quantitative Safety Constraint
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyConstraint <em>Safety Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getSafetyCase <em>Safety Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.DependabilityImpl#getErrorModelType <em>Error Model Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DependabilityImpl extends ContextImpl implements Dependability {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -81,6 +84,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -91,6 +95,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getFunctionalSafetyConcept() <em>Functional Safety Concept</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionalSafetyConcept()
 	 * @generated
 	 * @ordered
@@ -101,6 +106,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getSafetyGoal() <em>Safety Goal</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyGoal()
 	 * @generated
 	 * @ordered
@@ -111,6 +117,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getTechnicalSafetyConcept() <em>Technical Safety Concept</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTechnicalSafetyConcept()
 	 * @generated
 	 * @ordered
@@ -121,6 +128,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getHazardousEvent() <em>Hazardous Event</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazardousEvent()
 	 * @generated
 	 * @ordered
@@ -131,6 +139,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getFeatureFlaw() <em>Feature Flaw</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFeatureFlaw()
 	 * @generated
 	 * @ordered
@@ -141,6 +150,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getItem() <em>Item</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getItem()
 	 * @generated
 	 * @ordered
@@ -151,6 +161,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getEADatatype() <em>EA Datatype</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEADatatype()
 	 * @generated
 	 * @ordered
@@ -161,6 +172,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getFaultFailure() <em>Fault Failure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFaultFailure()
 	 * @generated
 	 * @ordered
@@ -171,6 +183,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getQuantitativeSafetyConstraint() <em>Quantitative Safety Constraint</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getQuantitativeSafetyConstraint()
 	 * @generated
 	 * @ordered
@@ -181,6 +194,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getSafetyConstraint() <em>Safety Constraint</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyConstraint()
 	 * @generated
 	 * @ordered
@@ -191,6 +205,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getSafetyCase() <em>Safety Case</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyCase()
 	 * @generated
 	 * @ordered
@@ -201,6 +216,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	 * The cached value of the '{@link #getErrorModelType() <em>Error Model Type</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getErrorModelType()
 	 * @generated
 	 * @ordered
@@ -210,6 +226,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DependabilityImpl() {
@@ -219,41 +236,44 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
-				return getFunctionalSafetyConcept();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
-				return getSafetyGoal();
-			case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
-				return getTechnicalSafetyConcept();
-			case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
-				return getHazardousEvent();
-			case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
-				return getFeatureFlaw();
-			case DependabilityPackage.DEPENDABILITY__ITEM:
-				return getItem();
-			case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
-				return getEADatatype();
-			case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
-				return getFaultFailure();
-			case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
-				return getQuantitativeSafetyConstraint();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
-				return getSafetyConstraint();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
-				return getSafetyCase();
-			case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
-				return getErrorModelType();
+		switch(featureID) {
+		case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
+			return getFunctionalSafetyConcept();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
+			return getSafetyGoal();
+		case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
+			return getTechnicalSafetyConcept();
+		case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
+			return getHazardousEvent();
+		case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
+			return getFeatureFlaw();
+		case DependabilityPackage.DEPENDABILITY__ITEM:
+			return getItem();
+		case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
+			return getEADatatype();
+		case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
+			return getFaultFailure();
+		case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
+			return getQuantitativeSafetyConstraint();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
+			return getSafetyConstraint();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
+			return getSafetyCase();
+		case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
+			return getErrorModelType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -261,39 +281,40 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
-				return base_Class != null;
-			case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
-				return base_Package != null;
-			case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
-				return functionalSafetyConcept != null && !functionalSafetyConcept.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
-				return safetyGoal != null && !safetyGoal.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
-				return technicalSafetyConcept != null && !technicalSafetyConcept.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
-				return hazardousEvent != null && !hazardousEvent.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
-				return featureFlaw != null && !featureFlaw.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__ITEM:
-				return item != null && !item.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
-				return eADatatype != null && !eADatatype.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
-				return faultFailure != null && !faultFailure.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
-				return quantitativeSafetyConstraint != null && !quantitativeSafetyConstraint.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
-				return safetyConstraint != null && !safetyConstraint.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
-				return safetyCase != null && !safetyCase.isEmpty();
-			case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
-				return errorModelType != null && !errorModelType.isEmpty();
+		switch(featureID) {
+		case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
+			return base_Class != null;
+		case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
+			return base_Package != null;
+		case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
+			return functionalSafetyConcept != null && !functionalSafetyConcept.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
+			return safetyGoal != null && !safetyGoal.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
+			return technicalSafetyConcept != null && !technicalSafetyConcept.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
+			return hazardousEvent != null && !hazardousEvent.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
+			return featureFlaw != null && !featureFlaw.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__ITEM:
+			return item != null && !item.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
+			return eADatatype != null && !eADatatype.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
+			return faultFailure != null && !faultFailure.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
+			return quantitativeSafetyConstraint != null && !quantitativeSafetyConstraint.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
+			return safetyConstraint != null && !safetyConstraint.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
+			return safetyCase != null && !safetyCase.isEmpty();
+		case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
+			return errorModelType != null && !errorModelType.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -301,66 +322,67 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
-				getFunctionalSafetyConcept().clear();
-				getFunctionalSafetyConcept().addAll((Collection<? extends FunctionalSafetyConcept>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
-				getSafetyGoal().clear();
-				getSafetyGoal().addAll((Collection<? extends SafetyGoal>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
-				getTechnicalSafetyConcept().clear();
-				getTechnicalSafetyConcept().addAll((Collection<? extends TechnicalSafetyConcept>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
-				getHazardousEvent().clear();
-				getHazardousEvent().addAll((Collection<? extends HazardousEvent>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
-				getFeatureFlaw().clear();
-				getFeatureFlaw().addAll((Collection<? extends FeatureFlaw>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__ITEM:
-				getItem().clear();
-				getItem().addAll((Collection<? extends Item>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
-				getEADatatype().clear();
-				getEADatatype().addAll((Collection<? extends EADatatype>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
-				getFaultFailure().clear();
-				getFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
-				getQuantitativeSafetyConstraint().clear();
-				getQuantitativeSafetyConstraint().addAll((Collection<? extends QuantitativeSafetyConstraint>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
-				getSafetyConstraint().clear();
-				getSafetyConstraint().addAll((Collection<? extends SafetyConstraint>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
-				getSafetyCase().clear();
-				getSafetyCase().addAll((Collection<? extends SafetyCase>)newValue);
-				return;
-			case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
-				getErrorModelType().clear();
-				getErrorModelType().addAll((Collection<? extends ErrorModelType>)newValue);
-				return;
+		switch(featureID) {
+		case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
+			getFunctionalSafetyConcept().clear();
+			getFunctionalSafetyConcept().addAll((Collection<? extends FunctionalSafetyConcept>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
+			getSafetyGoal().clear();
+			getSafetyGoal().addAll((Collection<? extends SafetyGoal>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
+			getTechnicalSafetyConcept().clear();
+			getTechnicalSafetyConcept().addAll((Collection<? extends TechnicalSafetyConcept>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
+			getHazardousEvent().clear();
+			getHazardousEvent().addAll((Collection<? extends HazardousEvent>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
+			getFeatureFlaw().clear();
+			getFeatureFlaw().addAll((Collection<? extends FeatureFlaw>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__ITEM:
+			getItem().clear();
+			getItem().addAll((Collection<? extends Item>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
+			getEADatatype().clear();
+			getEADatatype().addAll((Collection<? extends EADatatype>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
+			getFaultFailure().clear();
+			getFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
+			getQuantitativeSafetyConstraint().clear();
+			getQuantitativeSafetyConstraint().addAll((Collection<? extends QuantitativeSafetyConstraint>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
+			getSafetyConstraint().clear();
+			getSafetyConstraint().addAll((Collection<? extends SafetyConstraint>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
+			getSafetyCase().clear();
+			getSafetyCase().addAll((Collection<? extends SafetyCase>)newValue);
+			return;
+		case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
+			getErrorModelType().clear();
+			getErrorModelType().addAll((Collection<? extends ErrorModelType>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -368,6 +390,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -378,14 +401,15 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.DEPENDABILITY__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -395,6 +419,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -404,26 +429,28 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.DEPENDABILITY__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.DEPENDABILITY__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -433,6 +460,7 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -442,65 +470,67 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.DEPENDABILITY__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
-				getFunctionalSafetyConcept().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
-				getSafetyGoal().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
-				getTechnicalSafetyConcept().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
-				getHazardousEvent().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
-				getFeatureFlaw().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__ITEM:
-				getItem().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
-				getEADatatype().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
-				getFaultFailure().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
-				getQuantitativeSafetyConstraint().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
-				getSafetyConstraint().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
-				getSafetyCase().clear();
-				return;
-			case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
-				getErrorModelType().clear();
-				return;
+		switch(featureID) {
+		case DependabilityPackage.DEPENDABILITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case DependabilityPackage.DEPENDABILITY__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT:
+			getFunctionalSafetyConcept().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_GOAL:
+			getSafetyGoal().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT:
+			getTechnicalSafetyConcept().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT:
+			getHazardousEvent().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__FEATURE_FLAW:
+			getFeatureFlaw().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__ITEM:
+			getItem().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__EA_DATATYPE:
+			getEADatatype().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__FAULT_FAILURE:
+			getFaultFailure().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT:
+			getQuantitativeSafetyConstraint().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT:
+			getSafetyConstraint().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__SAFETY_CASE:
+			getSafetyCase().clear();
+			return;
+		case DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE:
+			getErrorModelType().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -508,10 +538,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ErrorModelType> getErrorModelType() {
-		if (errorModelType == null) {
+		if(errorModelType == null) {
 			errorModelType = new EObjectResolvingEList<ErrorModelType>(ErrorModelType.class, this, DependabilityPackage.DEPENDABILITY__ERROR_MODEL_TYPE);
 		}
 		return errorModelType;
@@ -520,10 +551,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FaultFailure> getFaultFailure() {
-		if (faultFailure == null) {
+		if(faultFailure == null) {
 			faultFailure = new EObjectResolvingEList<FaultFailure>(FaultFailure.class, this, DependabilityPackage.DEPENDABILITY__FAULT_FAILURE);
 		}
 		return faultFailure;
@@ -532,10 +564,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FeatureFlaw> getFeatureFlaw() {
-		if (featureFlaw == null) {
+		if(featureFlaw == null) {
 			featureFlaw = new EObjectResolvingEList<FeatureFlaw>(FeatureFlaw.class, this, DependabilityPackage.DEPENDABILITY__FEATURE_FLAW);
 		}
 		return featureFlaw;
@@ -544,10 +577,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionalSafetyConcept> getFunctionalSafetyConcept() {
-		if (functionalSafetyConcept == null) {
+		if(functionalSafetyConcept == null) {
 			functionalSafetyConcept = new EObjectResolvingEList<FunctionalSafetyConcept>(FunctionalSafetyConcept.class, this, DependabilityPackage.DEPENDABILITY__FUNCTIONAL_SAFETY_CONCEPT);
 		}
 		return functionalSafetyConcept;
@@ -556,10 +590,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HazardousEvent> getHazardousEvent() {
-		if (hazardousEvent == null) {
+		if(hazardousEvent == null) {
 			hazardousEvent = new EObjectResolvingEList<HazardousEvent>(HazardousEvent.class, this, DependabilityPackage.DEPENDABILITY__HAZARDOUS_EVENT);
 		}
 		return hazardousEvent;
@@ -568,10 +603,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Item> getItem() {
-		if (item == null) {
+		if(item == null) {
 			item = new EObjectResolvingEList<Item>(Item.class, this, DependabilityPackage.DEPENDABILITY__ITEM);
 		}
 		return item;
@@ -580,10 +616,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EADatatype> getEADatatype() {
-		if (eADatatype == null) {
+		if(eADatatype == null) {
 			eADatatype = new EObjectResolvingEList<EADatatype>(EADatatype.class, this, DependabilityPackage.DEPENDABILITY__EA_DATATYPE);
 		}
 		return eADatatype;
@@ -592,10 +629,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<QuantitativeSafetyConstraint> getQuantitativeSafetyConstraint() {
-		if (quantitativeSafetyConstraint == null) {
+		if(quantitativeSafetyConstraint == null) {
 			quantitativeSafetyConstraint = new EObjectResolvingEList<QuantitativeSafetyConstraint>(QuantitativeSafetyConstraint.class, this, DependabilityPackage.DEPENDABILITY__QUANTITATIVE_SAFETY_CONSTRAINT);
 		}
 		return quantitativeSafetyConstraint;
@@ -604,10 +642,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SafetyCase> getSafetyCase() {
-		if (safetyCase == null) {
+		if(safetyCase == null) {
 			safetyCase = new EObjectResolvingEList<SafetyCase>(SafetyCase.class, this, DependabilityPackage.DEPENDABILITY__SAFETY_CASE);
 		}
 		return safetyCase;
@@ -616,10 +655,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SafetyConstraint> getSafetyConstraint() {
-		if (safetyConstraint == null) {
+		if(safetyConstraint == null) {
 			safetyConstraint = new EObjectResolvingEList<SafetyConstraint>(SafetyConstraint.class, this, DependabilityPackage.DEPENDABILITY__SAFETY_CONSTRAINT);
 		}
 		return safetyConstraint;
@@ -628,10 +668,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SafetyGoal> getSafetyGoal() {
-		if (safetyGoal == null) {
+		if(safetyGoal == null) {
 			safetyGoal = new EObjectResolvingEList<SafetyGoal>(SafetyGoal.class, this, DependabilityPackage.DEPENDABILITY__SAFETY_GOAL);
 		}
 		return safetyGoal;
@@ -640,10 +681,11 @@ public class DependabilityImpl extends ContextImpl implements Dependability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TechnicalSafetyConcept> getTechnicalSafetyConcept() {
-		if (technicalSafetyConcept == null) {
+		if(technicalSafetyConcept == null) {
 			technicalSafetyConcept = new EObjectResolvingEList<TechnicalSafetyConcept>(TechnicalSafetyConcept.class, this, DependabilityPackage.DEPENDABILITY__TECHNICAL_SAFETY_CONCEPT);
 		}
 		return technicalSafetyConcept;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityPackageImpl.java
index c5f671f7d6c..2fe4807e8cc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/DependabilityPackageImpl.java
@@ -95,6 +95,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DependabilityPackageImpl extends EPackageImpl implements DependabilityPackage {
@@ -102,6 +103,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hazardousEventEClass = null;
@@ -109,6 +111,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hazardEClass = null;
@@ -116,6 +119,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass featureFlawEClass = null;
@@ -123,6 +127,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass itemEClass = null;
@@ -130,6 +135,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass dependabilityEClass = null;
@@ -137,6 +143,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum controllabilityClassKindEEnum = null;
@@ -144,6 +151,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum exposureClassKindEEnum = null;
@@ -151,6 +159,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum severityClassKindEEnum = null;
@@ -158,6 +167,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum developmentCategoryKindEEnum = null;
@@ -165,6 +175,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -172,16 +183,18 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * 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 DependabilityPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link DependabilityPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static DependabilityPackage init() {
-		if (isInited) return (DependabilityPackage)EPackage.Registry.INSTANCE.getEPackage(DependabilityPackage.eNS_URI);
+		if(isInited)
+			return (DependabilityPackage)EPackage.Registry.INSTANCE.getEPackage(DependabilityPackage.eNS_URI);
 
 		// Obtain or create and register package
 		DependabilityPackageImpl theDependabilityPackage = (DependabilityPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DependabilityPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DependabilityPackageImpl());
@@ -283,7 +296,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 		// Mark meta-data to indicate it can't be changed
 		theDependabilityPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DependabilityPackage.eNS_URI, theDependabilityPackage);
 		return theDependabilityPackage;
@@ -292,6 +305,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -299,19 +313,19 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage#eNS_URI
 	 * @see #init()
@@ -322,14 +336,16 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -388,6 +404,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getControllabilityClassKind() {
@@ -397,6 +414,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDependability() {
@@ -406,6 +424,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_Base_Class() {
@@ -415,6 +434,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_Base_Package() {
@@ -424,6 +444,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_ErrorModelType() {
@@ -433,6 +454,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_FaultFailure() {
@@ -442,6 +464,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_FeatureFlaw() {
@@ -451,6 +474,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_FunctionalSafetyConcept() {
@@ -460,6 +484,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_HazardousEvent() {
@@ -469,6 +494,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_Item() {
@@ -478,6 +504,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_EADatatype() {
@@ -487,6 +514,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_QuantitativeSafetyConstraint() {
@@ -496,6 +524,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_SafetyCase() {
@@ -505,6 +534,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_SafetyConstraint() {
@@ -514,6 +544,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_SafetyGoal() {
@@ -523,6 +554,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDependability_TechnicalSafetyConcept() {
@@ -532,6 +564,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DependabilityFactory getDependabilityFactory() {
@@ -541,6 +574,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getDevelopmentCategoryKind() {
@@ -550,6 +584,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getExposureClassKind() {
@@ -559,6 +594,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFeatureFlaw() {
@@ -568,6 +604,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFeatureFlaw_Base_Class() {
@@ -577,6 +614,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFeatureFlaw_Item() {
@@ -586,6 +624,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFeatureFlaw_NonFulfilledRequirement() {
@@ -595,6 +634,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHazard() {
@@ -604,6 +644,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazard_Base_Class() {
@@ -613,6 +654,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazard_Item() {
@@ -622,6 +664,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazard_Malfunction() {
@@ -631,6 +674,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHazardousEvent() {
@@ -640,6 +684,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_Base_Class() {
@@ -649,6 +694,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHazardousEvent_ClassificationAssumptions() {
@@ -658,6 +704,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHazardousEvent_Controllability() {
@@ -667,6 +714,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_Environment() {
@@ -676,6 +724,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHazardousEvent_Exposure() {
@@ -685,6 +734,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_ExternalMeasures() {
@@ -694,6 +744,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_Hazard() {
@@ -703,6 +754,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHazardousEvent_HazardClassification() {
@@ -712,6 +764,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_OperatingMode() {
@@ -721,6 +774,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_OperationalSituationUseCase() {
@@ -730,6 +784,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHazardousEvent_Severity() {
@@ -739,6 +794,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHazardousEvent_Traffic() {
@@ -748,6 +804,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getItem() {
@@ -757,6 +814,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getItem_Base_Class() {
@@ -766,6 +824,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getItem_DevelopmentCategory() {
@@ -775,6 +834,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getItem_VehicleFeature() {
@@ -784,6 +844,7 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getSeverityClassKind() {
@@ -791,14 +852,16 @@ public class DependabilityPackageImpl extends EPackageImpl implements Dependabil
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/FeatureFlawImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/FeatureFlawImpl.java
index dfa897c7ca0..cec98bc5990 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/FeatureFlawImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/FeatureFlawImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.papyrus.eastadl.requirements.Requirement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getItem <em>Item</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getNonFulfilledRequirement <em>Non Fulfilled Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.FeatureFlawImpl#getNonFulfilledRequirement <em>Non Fulfilled Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FeatureFlawImpl extends TraceableSpecificationImpl implements FeatureFlaw {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -60,15 +62,18 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	 * The cached value of the '{@link #getItem() <em>Item</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getItem()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList<Item> item;
+
 	/**
 	 * The cached value of the '{@link #getNonFulfilledRequirement() <em>Non Fulfilled Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNonFulfilledRequirement()
 	 * @generated
 	 * @ordered
@@ -78,6 +83,7 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FeatureFlawImpl() {
@@ -87,18 +93,20 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case DependabilityPackage.FEATURE_FLAW__ITEM:
-				return getItem();
-			case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
-				return getNonFulfilledRequirement();
+		switch(featureID) {
+		case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case DependabilityPackage.FEATURE_FLAW__ITEM:
+			return getItem();
+		case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
+			return getNonFulfilledRequirement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -106,17 +114,18 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
-				return base_Class != null;
-			case DependabilityPackage.FEATURE_FLAW__ITEM:
-				return item != null && !item.isEmpty();
-			case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
-				return nonFulfilledRequirement != null && !nonFulfilledRequirement.isEmpty();
+		switch(featureID) {
+		case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
+			return base_Class != null;
+		case DependabilityPackage.FEATURE_FLAW__ITEM:
+			return item != null && !item.isEmpty();
+		case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
+			return nonFulfilledRequirement != null && !nonFulfilledRequirement.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -124,23 +133,24 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case DependabilityPackage.FEATURE_FLAW__ITEM:
-				getItem().clear();
-				getItem().addAll((Collection<? extends Item>)newValue);
-				return;
-			case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
-				getNonFulfilledRequirement().clear();
-				getNonFulfilledRequirement().addAll((Collection<? extends Requirement>)newValue);
-				return;
+		switch(featureID) {
+		case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case DependabilityPackage.FEATURE_FLAW__ITEM:
+			getItem().clear();
+			getItem().addAll((Collection<? extends Item>)newValue);
+			return;
+		case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
+			getNonFulfilledRequirement().clear();
+			getNonFulfilledRequirement().addAll((Collection<? extends Requirement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,14 +169,15 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.FEATURE_FLAW__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -175,6 +187,7 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -184,32 +197,34 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.FEATURE_FLAW__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case DependabilityPackage.FEATURE_FLAW__ITEM:
-				getItem().clear();
-				return;
-			case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
-				getNonFulfilledRequirement().clear();
-				return;
+		switch(featureID) {
+		case DependabilityPackage.FEATURE_FLAW__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case DependabilityPackage.FEATURE_FLAW__ITEM:
+			getItem().clear();
+			return;
+		case DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT:
+			getNonFulfilledRequirement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -217,10 +232,11 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Item> getItem() {
-		if (item == null) {
+		if(item == null) {
 			item = new EObjectResolvingEList<Item>(Item.class, this, DependabilityPackage.FEATURE_FLAW__ITEM);
 		}
 		return item;
@@ -229,10 +245,11 @@ public class FeatureFlawImpl extends TraceableSpecificationImpl implements Featu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getNonFulfilledRequirement() {
-		if (nonFulfilledRequirement == null) {
+		if(nonFulfilledRequirement == null) {
 			nonFulfilledRequirement = new EObjectResolvingEList<Requirement>(Requirement.class, this, DependabilityPackage.FEATURE_FLAW__NON_FULFILLED_REQUIREMENT);
 		}
 		return nonFulfilledRequirement;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardImpl.java
index 24ffabbb130..901d5a0275d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getMalfunction <em>Malfunction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getItem <em>Item</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getMalfunction <em>Malfunction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardImpl#getItem <em>Item</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -60,6 +62,7 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	 * The cached value of the '{@link #getMalfunction() <em>Malfunction</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMalfunction()
 	 * @generated
 	 * @ordered
@@ -70,6 +73,7 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	 * The cached value of the '{@link #getItem() <em>Item</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getItem()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HazardImpl() {
@@ -88,18 +93,20 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARD__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case DependabilityPackage.HAZARD__MALFUNCTION:
-				return getMalfunction();
-			case DependabilityPackage.HAZARD__ITEM:
-				return getItem();
+		switch(featureID) {
+		case DependabilityPackage.HAZARD__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case DependabilityPackage.HAZARD__MALFUNCTION:
+			return getMalfunction();
+		case DependabilityPackage.HAZARD__ITEM:
+			return getItem();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +114,18 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARD__BASE_CLASS:
-				return base_Class != null;
-			case DependabilityPackage.HAZARD__MALFUNCTION:
-				return malfunction != null && !malfunction.isEmpty();
-			case DependabilityPackage.HAZARD__ITEM:
-				return item != null && !item.isEmpty();
+		switch(featureID) {
+		case DependabilityPackage.HAZARD__BASE_CLASS:
+			return base_Class != null;
+		case DependabilityPackage.HAZARD__MALFUNCTION:
+			return malfunction != null && !malfunction.isEmpty();
+		case DependabilityPackage.HAZARD__ITEM:
+			return item != null && !item.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,23 +133,24 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARD__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case DependabilityPackage.HAZARD__MALFUNCTION:
-				getMalfunction().clear();
-				getMalfunction().addAll((Collection<? extends FeatureFlaw>)newValue);
-				return;
-			case DependabilityPackage.HAZARD__ITEM:
-				getItem().clear();
-				getItem().addAll((Collection<? extends Item>)newValue);
-				return;
+		switch(featureID) {
+		case DependabilityPackage.HAZARD__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case DependabilityPackage.HAZARD__MALFUNCTION:
+			getMalfunction().clear();
+			getMalfunction().addAll((Collection<? extends FeatureFlaw>)newValue);
+			return;
+		case DependabilityPackage.HAZARD__ITEM:
+			getItem().clear();
+			getItem().addAll((Collection<? extends Item>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -149,6 +158,7 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,14 +169,15 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.HAZARD__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -176,6 +187,7 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -185,32 +197,34 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARD__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARD__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case DependabilityPackage.HAZARD__MALFUNCTION:
-				getMalfunction().clear();
-				return;
-			case DependabilityPackage.HAZARD__ITEM:
-				getItem().clear();
-				return;
+		switch(featureID) {
+		case DependabilityPackage.HAZARD__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case DependabilityPackage.HAZARD__MALFUNCTION:
+			getMalfunction().clear();
+			return;
+		case DependabilityPackage.HAZARD__ITEM:
+			getItem().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -218,10 +232,11 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Item> getItem() {
-		if (item == null) {
+		if(item == null) {
 			item = new EObjectResolvingEList<Item>(Item.class, this, DependabilityPackage.HAZARD__ITEM);
 		}
 		return item;
@@ -230,10 +245,11 @@ public class HazardImpl extends TraceableSpecificationImpl implements Hazard {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FeatureFlaw> getMalfunction() {
-		if (malfunction == null) {
+		if(malfunction == null) {
 			malfunction = new EObjectResolvingEList<FeatureFlaw>(FeatureFlaw.class, this, DependabilityPackage.HAZARD__MALFUNCTION);
 		}
 		return malfunction;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardousEventImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardousEventImpl.java
index e7b200b5bd4..ca5ed447599 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardousEventImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/HazardousEventImpl.java
@@ -44,28 +44,31 @@ import org.eclipse.uml2.uml.UseCase;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getControllability <em>Controllability</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getExposure <em>Exposure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getHazardClassification <em>Hazard Classification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getClassificationAssumptions <em>Classification Assumptions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getHazard <em>Hazard</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getTraffic <em>Traffic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getEnvironment <em>Environment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getOperationalSituationUseCase <em>Operational Situation Use Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getOperatingMode <em>Operating Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getExternalMeasures <em>External Measures</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getControllability <em>Controllability</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getExposure <em>Exposure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getHazardClassification <em>Hazard Classification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getSeverity <em>Severity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getClassificationAssumptions <em>Classification Assumptions</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getHazard <em>Hazard</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getTraffic <em>Traffic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getEnvironment <em>Environment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getOperationalSituationUseCase <em>Operational Situation Use Case
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getOperatingMode <em>Operating Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.HazardousEventImpl#getExternalMeasures <em>External Measures</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HazardousEventImpl extends TraceableSpecificationImpl implements HazardousEvent {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -76,6 +79,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The default value of the '{@link #getControllability() <em>Controllability</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getControllability()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getControllability() <em>Controllability</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getControllability()
 	 * @generated
 	 * @ordered
@@ -96,6 +101,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The default value of the '{@link #getExposure() <em>Exposure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExposure()
 	 * @generated
 	 * @ordered
@@ -106,6 +112,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getExposure() <em>Exposure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExposure()
 	 * @generated
 	 * @ordered
@@ -116,6 +123,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The default value of the '{@link #getHazardClassification() <em>Hazard Classification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazardClassification()
 	 * @generated
 	 * @ordered
@@ -126,6 +134,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getHazardClassification() <em>Hazard Classification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazardClassification()
 	 * @generated
 	 * @ordered
@@ -136,6 +145,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSeverity()
 	 * @generated
 	 * @ordered
@@ -146,6 +156,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSeverity()
 	 * @generated
 	 * @ordered
@@ -156,6 +167,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The default value of the '{@link #getClassificationAssumptions() <em>Classification Assumptions</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClassificationAssumptions()
 	 * @generated
 	 * @ordered
@@ -166,6 +178,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getClassificationAssumptions() <em>Classification Assumptions</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClassificationAssumptions()
 	 * @generated
 	 * @ordered
@@ -176,6 +189,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getHazard() <em>Hazard</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazard()
 	 * @generated
 	 * @ordered
@@ -186,6 +200,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getTraffic() <em>Traffic</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTraffic()
 	 * @generated
 	 * @ordered
@@ -196,6 +211,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getEnvironment() <em>Environment</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEnvironment()
 	 * @generated
 	 * @ordered
@@ -206,6 +222,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getOperationalSituationUseCase() <em>Operational Situation Use Case</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOperationalSituationUseCase()
 	 * @generated
 	 * @ordered
@@ -216,6 +233,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getOperatingMode() <em>Operating Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOperatingMode()
 	 * @generated
 	 * @ordered
@@ -226,6 +244,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	 * The cached value of the '{@link #getExternalMeasures() <em>External Measures</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExternalMeasures()
 	 * @generated
 	 * @ordered
@@ -235,6 +254,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HazardousEventImpl() {
@@ -244,36 +264,38 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
-				return getControllability();
-			case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
-				return getExposure();
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
-				return getHazardClassification();
-			case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
-				return getSeverity();
-			case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
-				return getClassificationAssumptions();
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
-				return getHazard();
-			case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
-				return getTraffic();
-			case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
-				return getEnvironment();
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
-				return getOperationalSituationUseCase();
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
-				return getOperatingMode();
-			case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
-				return getExternalMeasures();
+		switch(featureID) {
+		case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
+			return getControllability();
+		case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
+			return getExposure();
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
+			return getHazardClassification();
+		case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
+			return getSeverity();
+		case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
+			return getClassificationAssumptions();
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
+			return getHazard();
+		case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
+			return getTraffic();
+		case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
+			return getEnvironment();
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
+			return getOperationalSituationUseCase();
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
+			return getOperatingMode();
+		case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
+			return getExternalMeasures();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -281,35 +303,36 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
-				return base_Class != null;
-			case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
-				return controllability != CONTROLLABILITY_EDEFAULT;
-			case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
-				return exposure != EXPOSURE_EDEFAULT;
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
-				return hazardClassification != HAZARD_CLASSIFICATION_EDEFAULT;
-			case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
-				return severity != SEVERITY_EDEFAULT;
-			case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
-				return CLASSIFICATION_ASSUMPTIONS_EDEFAULT == null ? classificationAssumptions != null : !CLASSIFICATION_ASSUMPTIONS_EDEFAULT.equals(classificationAssumptions);
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
-				return hazard != null && !hazard.isEmpty();
-			case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
-				return traffic != null && !traffic.isEmpty();
-			case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
-				return environment != null && !environment.isEmpty();
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
-				return operationalSituationUseCase != null && !operationalSituationUseCase.isEmpty();
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
-				return operatingMode != null && !operatingMode.isEmpty();
-			case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
-				return externalMeasures != null && !externalMeasures.isEmpty();
+		switch(featureID) {
+		case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
+			return base_Class != null;
+		case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
+			return controllability != CONTROLLABILITY_EDEFAULT;
+		case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
+			return exposure != EXPOSURE_EDEFAULT;
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
+			return hazardClassification != HAZARD_CLASSIFICATION_EDEFAULT;
+		case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
+			return severity != SEVERITY_EDEFAULT;
+		case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
+			return CLASSIFICATION_ASSUMPTIONS_EDEFAULT == null ? classificationAssumptions != null : !CLASSIFICATION_ASSUMPTIONS_EDEFAULT.equals(classificationAssumptions);
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
+			return hazard != null && !hazard.isEmpty();
+		case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
+			return traffic != null && !traffic.isEmpty();
+		case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
+			return environment != null && !environment.isEmpty();
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
+			return operationalSituationUseCase != null && !operationalSituationUseCase.isEmpty();
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
+			return operatingMode != null && !operatingMode.isEmpty();
+		case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
+			return externalMeasures != null && !externalMeasures.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -317,54 +340,55 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
-				setControllability((ControllabilityClassKind)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
-				setExposure((ExposureClassKind)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
-				setHazardClassification((ASILKind)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
-				setSeverity((SeverityClassKind)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
-				setClassificationAssumptions((String)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
-				getHazard().clear();
-				getHazard().addAll((Collection<? extends Hazard>)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
-				getTraffic().clear();
-				getTraffic().addAll((Collection<? extends OperationalSituation>)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
-				getEnvironment().clear();
-				getEnvironment().addAll((Collection<? extends OperationalSituation>)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
-				getOperationalSituationUseCase().clear();
-				getOperationalSituationUseCase().addAll((Collection<? extends UseCase>)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
-				getOperatingMode().clear();
-				getOperatingMode().addAll((Collection<? extends Mode>)newValue);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
-				getExternalMeasures().clear();
-				getExternalMeasures().addAll((Collection<? extends Requirement>)newValue);
-				return;
+		switch(featureID) {
+		case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
+			setControllability((ControllabilityClassKind)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
+			setExposure((ExposureClassKind)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
+			setHazardClassification((ASILKind)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
+			setSeverity((SeverityClassKind)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
+			setClassificationAssumptions((String)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
+			getHazard().clear();
+			getHazard().addAll((Collection<? extends Hazard>)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
+			getTraffic().clear();
+			getTraffic().addAll((Collection<? extends OperationalSituation>)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
+			getEnvironment().clear();
+			getEnvironment().addAll((Collection<? extends OperationalSituation>)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
+			getOperationalSituationUseCase().clear();
+			getOperationalSituationUseCase().addAll((Collection<? extends UseCase>)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
+			getOperatingMode().clear();
+			getOperatingMode().addAll((Collection<? extends Mode>)newValue);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
+			getExternalMeasures().clear();
+			getExternalMeasures().addAll((Collection<? extends Requirement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -372,6 +396,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -382,14 +407,15 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -399,6 +425,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -408,59 +435,61 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
-				setControllability(CONTROLLABILITY_EDEFAULT);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
-				setExposure(EXPOSURE_EDEFAULT);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
-				setHazardClassification(HAZARD_CLASSIFICATION_EDEFAULT);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
-				setSeverity(SEVERITY_EDEFAULT);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
-				setClassificationAssumptions(CLASSIFICATION_ASSUMPTIONS_EDEFAULT);
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
-				getHazard().clear();
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
-				getTraffic().clear();
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
-				getEnvironment().clear();
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
-				getOperationalSituationUseCase().clear();
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
-				getOperatingMode().clear();
-				return;
-			case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
-				getExternalMeasures().clear();
-				return;
+		switch(featureID) {
+		case DependabilityPackage.HAZARDOUS_EVENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY:
+			setControllability(CONTROLLABILITY_EDEFAULT);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE:
+			setExposure(EXPOSURE_EDEFAULT);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION:
+			setHazardClassification(HAZARD_CLASSIFICATION_EDEFAULT);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__SEVERITY:
+			setSeverity(SEVERITY_EDEFAULT);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS:
+			setClassificationAssumptions(CLASSIFICATION_ASSUMPTIONS_EDEFAULT);
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__HAZARD:
+			getHazard().clear();
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC:
+			getTraffic().clear();
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT:
+			getEnvironment().clear();
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE:
+			getOperationalSituationUseCase().clear();
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE:
+			getOperatingMode().clear();
+			return;
+		case DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES:
+			getExternalMeasures().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -468,6 +497,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClassificationAssumptions() {
@@ -477,6 +507,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ControllabilityClassKind getControllability() {
@@ -486,10 +517,11 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<OperationalSituation> getEnvironment() {
-		if (environment == null) {
+		if(environment == null) {
 			environment = new EObjectResolvingEList<OperationalSituation>(OperationalSituation.class, this, DependabilityPackage.HAZARDOUS_EVENT__ENVIRONMENT);
 		}
 		return environment;
@@ -498,6 +530,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ExposureClassKind getExposure() {
@@ -507,10 +540,11 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getExternalMeasures() {
-		if (externalMeasures == null) {
+		if(externalMeasures == null) {
 			externalMeasures = new EObjectResolvingEList<Requirement>(Requirement.class, this, DependabilityPackage.HAZARDOUS_EVENT__EXTERNAL_MEASURES);
 		}
 		return externalMeasures;
@@ -519,10 +553,11 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Hazard> getHazard() {
-		if (hazard == null) {
+		if(hazard == null) {
 			hazard = new EObjectResolvingEList<Hazard>(Hazard.class, this, DependabilityPackage.HAZARDOUS_EVENT__HAZARD);
 		}
 		return hazard;
@@ -531,6 +566,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ASILKind getHazardClassification() {
@@ -540,22 +576,24 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHazardClassification(ASILKind newHazardClassification) {
 		ASILKind oldHazardClassification = hazardClassification;
 		hazardClassification = newHazardClassification == null ? HAZARD_CLASSIFICATION_EDEFAULT : newHazardClassification;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__HAZARD_CLASSIFICATION, oldHazardClassification, hazardClassification));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getOperatingMode() {
-		if (operatingMode == null) {
+		if(operatingMode == null) {
 			operatingMode = new EObjectResolvingEList<Mode>(Mode.class, this, DependabilityPackage.HAZARDOUS_EVENT__OPERATING_MODE);
 		}
 		return operatingMode;
@@ -564,10 +602,11 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UseCase> getOperationalSituationUseCase() {
-		if (operationalSituationUseCase == null) {
+		if(operationalSituationUseCase == null) {
 			operationalSituationUseCase = new EObjectResolvingEList<UseCase>(UseCase.class, this, DependabilityPackage.HAZARDOUS_EVENT__OPERATIONAL_SITUATION_USE_CASE);
 		}
 		return operationalSituationUseCase;
@@ -576,6 +615,7 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SeverityClassKind getSeverity() {
@@ -585,10 +625,11 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<OperationalSituation> getTraffic() {
-		if (traffic == null) {
+		if(traffic == null) {
 			traffic = new EObjectResolvingEList<OperationalSituation>(OperationalSituation.class, this, DependabilityPackage.HAZARDOUS_EVENT__TRAFFIC);
 		}
 		return traffic;
@@ -597,59 +638,65 @@ public class HazardousEventImpl extends TraceableSpecificationImpl implements Ha
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClassificationAssumptions(String newClassificationAssumptions) {
 		String oldClassificationAssumptions = classificationAssumptions;
 		classificationAssumptions = newClassificationAssumptions;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__CLASSIFICATION_ASSUMPTIONS, oldClassificationAssumptions, classificationAssumptions));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setControllability(ControllabilityClassKind newControllability) {
 		ControllabilityClassKind oldControllability = controllability;
 		controllability = newControllability == null ? CONTROLLABILITY_EDEFAULT : newControllability;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__CONTROLLABILITY, oldControllability, controllability));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setExposure(ExposureClassKind newExposure) {
 		ExposureClassKind oldExposure = exposure;
 		exposure = newExposure == null ? EXPOSURE_EDEFAULT : newExposure;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__EXPOSURE, oldExposure, exposure));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSeverity(SeverityClassKind newSeverity) {
 		SeverityClassKind oldSeverity = severity;
 		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.HAZARDOUS_EVENT__SEVERITY, oldSeverity, severity));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (controllability: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/ItemImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/ItemImpl.java
index 08904e181ee..dcc9f563522 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/ItemImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/impl/ItemImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeatu
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getDevelopmentCategory <em>Development Category</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getVehicleFeature <em>Vehicle Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getDevelopmentCategory <em>Development Category</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.impl.ItemImpl#getVehicleFeature <em>Vehicle Feature</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ItemImpl extends EAElementImpl implements Item {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -60,6 +62,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	 * The default value of the '{@link #getDevelopmentCategory() <em>Development Category</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDevelopmentCategory()
 	 * @generated
 	 * @ordered
@@ -70,6 +73,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	 * The cached value of the '{@link #getDevelopmentCategory() <em>Development Category</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDevelopmentCategory()
 	 * @generated
 	 * @ordered
@@ -80,6 +84,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	 * The cached value of the '{@link #getVehicleFeature() <em>Vehicle Feature</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVehicleFeature()
 	 * @generated
 	 * @ordered
@@ -89,6 +94,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ItemImpl() {
@@ -98,18 +104,20 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DependabilityPackage.ITEM__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
-				return getDevelopmentCategory();
-			case DependabilityPackage.ITEM__VEHICLE_FEATURE:
-				return getVehicleFeature();
+		switch(featureID) {
+		case DependabilityPackage.ITEM__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
+			return getDevelopmentCategory();
+		case DependabilityPackage.ITEM__VEHICLE_FEATURE:
+			return getVehicleFeature();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -117,17 +125,18 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.ITEM__BASE_CLASS:
-				return base_Class != null;
-			case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
-				return developmentCategory != DEVELOPMENT_CATEGORY_EDEFAULT;
-			case DependabilityPackage.ITEM__VEHICLE_FEATURE:
-				return vehicleFeature != null && !vehicleFeature.isEmpty();
+		switch(featureID) {
+		case DependabilityPackage.ITEM__BASE_CLASS:
+			return base_Class != null;
+		case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
+			return developmentCategory != DEVELOPMENT_CATEGORY_EDEFAULT;
+		case DependabilityPackage.ITEM__VEHICLE_FEATURE:
+			return vehicleFeature != null && !vehicleFeature.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -135,22 +144,23 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DependabilityPackage.ITEM__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
-				setDevelopmentCategory((DevelopmentCategoryKind)newValue);
-				return;
-			case DependabilityPackage.ITEM__VEHICLE_FEATURE:
-				getVehicleFeature().clear();
-				getVehicleFeature().addAll((Collection<? extends VehicleFeature>)newValue);
-				return;
+		switch(featureID) {
+		case DependabilityPackage.ITEM__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
+			setDevelopmentCategory((DevelopmentCategoryKind)newValue);
+			return;
+		case DependabilityPackage.ITEM__VEHICLE_FEATURE:
+			getVehicleFeature().clear();
+			getVehicleFeature().addAll((Collection<? extends VehicleFeature>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -158,6 +168,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,14 +179,15 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DependabilityPackage.ITEM__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -185,6 +197,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -194,32 +207,34 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.ITEM__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DependabilityPackage.ITEM__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
-				setDevelopmentCategory(DEVELOPMENT_CATEGORY_EDEFAULT);
-				return;
-			case DependabilityPackage.ITEM__VEHICLE_FEATURE:
-				getVehicleFeature().clear();
-				return;
+		switch(featureID) {
+		case DependabilityPackage.ITEM__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY:
+			setDevelopmentCategory(DEVELOPMENT_CATEGORY_EDEFAULT);
+			return;
+		case DependabilityPackage.ITEM__VEHICLE_FEATURE:
+			getVehicleFeature().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -227,6 +242,7 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DevelopmentCategoryKind getDevelopmentCategory() {
@@ -236,10 +252,11 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VehicleFeature> getVehicleFeature() {
-		if (vehicleFeature == null) {
+		if(vehicleFeature == null) {
 			vehicleFeature = new EObjectResolvingEList<VehicleFeature>(VehicleFeature.class, this, DependabilityPackage.ITEM__VEHICLE_FEATURE);
 		}
 		return vehicleFeature;
@@ -248,23 +265,26 @@ public class ItemImpl extends EAElementImpl implements Item {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDevelopmentCategory(DevelopmentCategoryKind newDevelopmentCategory) {
 		DevelopmentCategoryKind oldDevelopmentCategory = developmentCategory;
 		developmentCategory = newDevelopmentCategory == null ? DEVELOPMENT_CATEGORY_EDEFAULT : newDevelopmentCategory;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DependabilityPackage.ITEM__DEVELOPMENT_CATEGORY, oldDevelopmentCategory, developmentCategory));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (developmentCategory: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Claim.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Claim.java
index c0afda1d33b..56e8090a689 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Claim.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Claim.java
@@ -24,44 +24,46 @@ import org.eclipse.uml2.uml.Comment;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Claim</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Claim represents a statement the truth of which needs to be confirmed.
  * 
- * Claim has associations to the strategy for goal decomposition and to supported arguments. It also holds associations to the evidences for the SafetyCase.
+ * Claim has associations to the strategy for goal decomposition and to supported arguments. It also holds associations to the evidences for the
+ * SafetyCase.
  * 
  * Semantics:
  * Goal-based development provides the claim what should be achieved.
  * 
  * Goal is what the argument must show to be true.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSafetyRequirement <em>Safety Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSupportedArgument <em>Supported Argument</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getGoalDecompositionStrategy <em>Goal Decomposition Strategy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getJustification <em>Justification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getEvidence <em>Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSafetyRequirement <em>Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSupportedArgument <em>Supported Argument</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getGoalDecompositionStrategy <em>Goal Decomposition Strategy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getEvidence <em>Evidence</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim()
  * @model
  * @generated
  */
 public interface Claim extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Evidence</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Evidence</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Evidence</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Evidence</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_Evidence()
 	 * @model required="true" ordered="false"
@@ -74,10 +76,10 @@ public interface Claim extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Goal Decomposition Strategy</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Goal Decomposition Strategy</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Goal Decomposition Strategy</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_GoalDecompositionStrategy()
 	 * @model ordered="false"
@@ -89,10 +91,10 @@ public interface Claim extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_Base_Class()
@@ -105,7 +107,9 @@ public interface Claim extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -116,10 +120,10 @@ public interface Claim extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.Comment}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Justification</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_Justification()
 	 * @model ordered="false"
@@ -135,6 +139,7 @@ public interface Claim extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Safety requirements and objectives in system model.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_SafetyRequirement()
 	 * @model ordered="false"
@@ -147,10 +152,10 @@ public interface Claim extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Supported Argument</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Supported Argument</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Supported Argument</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getClaim_SupportedArgument()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Ground.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Ground.java
index 2625cb50e41..56a58a26eea 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Ground.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Ground.java
@@ -25,45 +25,49 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Ground</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Claim is based on Grounds (evidences) - specific facts about a precise situation that clarify and make good the Claim. 
+ * Claim is based on Grounds (evidences) - specific facts about a precise situation that clarify and make good the Claim.
  * 
  * Ground represents statements that explain how the SafetyCase Ground clarifies and make good the Claim.
  * 
  * Ground has associations to the entities that are the evidences in the SafetyCase.
  * 
  * Semantics:
- * Ground (evidence) is information that supports the Claim that the safety requirements and objectives are met i.e. used as the basis of the safety argument.
+ * Ground (evidence) is information that supports the Claim that the safety requirements and objectives are met i.e. used as the basis of the safety
+ * argument.
  * 
- * Solution is evidence that the sub-goals have been met. This can be achieved by decomposing all goal claims to a level where direct reference to evidences was felt possible.
+ * Solution is evidence that the sub-goals have been met. This can be achieved by decomposing all goal claims to a level where direct reference to
+ * evidences was felt possible.
  * 
- * The evidences address different aspects of the goal. It always has to be ensured that each of them is defensible enough to confirm the underlying statement.
+ * The evidences address different aspects of the goal. It always has to be ensured that each of them is defensible enough to confirm the underlying
+ * statement.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getSafetyEvidence <em>Safety Evidence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getSafetyEvidence <em>Safety Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getJustification <em>Justification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getGround()
  * @model
  * @generated
  */
 public interface Ground extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Justification</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.uml2.uml.Comment}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Justification</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getGround_Justification()
 	 * @model ordered="false"
@@ -79,6 +83,7 @@ public interface Ground extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Safety evidence in system model.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Evidence</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getGround_SafetyEvidence()
 	 * @model ordered="false"
@@ -90,10 +95,10 @@ public interface Ground extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getGround_Base_Class()
@@ -106,7 +111,9 @@ public interface Ground extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/LifecycleStageKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/LifecycleStageKind.java
index 18784a3285a..2c9c9988927 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/LifecycleStageKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/LifecycleStageKind.java
@@ -27,22 +27,25 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The SafetyCase should be initiated at the earliest possible stage in the safety program so that hazards are identified and dealt with while the opportunities for their exclusion exist. 
+ * The SafetyCase should be initiated at the earliest possible stage in the safety program so that hazards are identified and dealt with while the
+ * opportunities for their exclusion exist.
  * 
  * The LifecycleStageKind is an enumeration metaclass with enumeration literals indicating safety case life cycle stage.
  * 
  * Semantics:
  * The safety case is one incremental safety case, rather than several complete new ones. The safety case lifecycle stage has the following meanings:
  * 
- * - The preliminary safety case is started when development of the system is started. After this stage discussions with the customer can commence about possible safety issues (hazards). 
+ * - The preliminary safety case is started when development of the system is started. After this stage discussions with the customer can commence
+ * about possible safety issues (hazards).
  * 
  * - The interim safety case is situated after the first system design and tests.
  * 
- * - The operational safety case is prior to in-service use. 
+ * - The operational safety case is prior to in-service use.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getLifecycleStageKind()
  * @model
  * @generated
@@ -52,6 +55,7 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Preliminary Safety Case</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PRELIMINARY_SAFETY_CASE_VALUE
 	 * @generated
 	 * @ordered
@@ -62,6 +66,7 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Interim Safety Case</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INTERIM_SAFETY_CASE_VALUE
 	 * @generated
 	 * @ordered
@@ -72,6 +77,7 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Operational Safety Case</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPERATIONAL_SAFETY_CASE_VALUE
 	 * @generated
 	 * @ordered
@@ -82,10 +88,10 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Preliminary Safety Case</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Preliminary Safety Case</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Preliminary Safety Case</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PRELIMINARY_SAFETY_CASE
 	 * @model name="PreliminarySafetyCase"
 	 * @generated
@@ -97,10 +103,10 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Interim Safety Case</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Interim Safety Case</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Interim Safety Case</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INTERIM_SAFETY_CASE
 	 * @model name="InterimSafetyCase"
 	 * @generated
@@ -112,10 +118,10 @@ public enum LifecycleStageKind implements Enumerator {
 	 * The '<em><b>Operational Safety Case</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Operational Safety Case</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Operational Safety Case</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPERATIONAL_SAFETY_CASE
 	 * @model name="OperationalSafetyCase"
 	 * @generated
@@ -127,19 +133,16 @@ public enum LifecycleStageKind implements Enumerator {
 	 * An array of all the '<em><b>Lifecycle Stage Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final LifecycleStageKind[] VALUES_ARRAY =
-		new LifecycleStageKind[] {
-			PRELIMINARY_SAFETY_CASE,
-			INTERIM_SAFETY_CASE,
-			OPERATIONAL_SAFETY_CASE,
-		};
+	private static final LifecycleStageKind[] VALUES_ARRAY = new LifecycleStageKind[]{ PRELIMINARY_SAFETY_CASE, INTERIM_SAFETY_CASE, OPERATIONAL_SAFETY_CASE, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Lifecycle Stage Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<LifecycleStageKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -148,13 +151,17 @@ public enum LifecycleStageKind implements Enumerator {
 	 * Returns the '<em><b>Lifecycle Stage Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LifecycleStageKind get(int value) {
-		switch (value) {
-			case PRELIMINARY_SAFETY_CASE_VALUE: return PRELIMINARY_SAFETY_CASE;
-			case INTERIM_SAFETY_CASE_VALUE: return INTERIM_SAFETY_CASE;
-			case OPERATIONAL_SAFETY_CASE_VALUE: return OPERATIONAL_SAFETY_CASE;
+		switch(value) {
+		case PRELIMINARY_SAFETY_CASE_VALUE:
+			return PRELIMINARY_SAFETY_CASE;
+		case INTERIM_SAFETY_CASE_VALUE:
+			return INTERIM_SAFETY_CASE;
+		case OPERATIONAL_SAFETY_CASE_VALUE:
+			return OPERATIONAL_SAFETY_CASE;
 		}
 		return null;
 	}
@@ -163,12 +170,13 @@ public enum LifecycleStageKind implements Enumerator {
 	 * Returns the '<em><b>Lifecycle Stage Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LifecycleStageKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LifecycleStageKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -179,12 +187,13 @@ public enum LifecycleStageKind implements Enumerator {
 	 * Returns the '<em><b>Lifecycle Stage Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LifecycleStageKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LifecycleStageKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -194,6 +203,7 @@ public enum LifecycleStageKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -201,6 +211,7 @@ public enum LifecycleStageKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -208,6 +219,7 @@ public enum LifecycleStageKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -216,6 +228,7 @@ public enum LifecycleStageKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private LifecycleStageKind(int value, String name, String literal) {
@@ -227,39 +240,43 @@ public enum LifecycleStageKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //LifecycleStageKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetyCase.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetyCase.java
index 8fe6bfe46c0..17f55f210e4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetyCase.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetyCase.java
@@ -23,40 +23,42 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Safety Case</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * SafetyCase represents a safety case that communicates a clear, comprehensive and defensible argument that a system is acceptable safe to operate in a given context.
+ * SafetyCase represents a safety case that communicates a clear, comprehensive and defensible argument that a system is acceptable safe to operate in
+ * a given context.
  * 
  * Safety Cases are used in safety related systems, where failures can lead to catastrophic or at least dangerous consequences.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getSafetyCase <em>Safety Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getStage <em>Stage</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getGround <em>Ground</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getWarrant <em>Warrant</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getClaim <em>Claim</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getSafetyCase <em>Safety Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getStage <em>Stage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext <em>Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getGround <em>Ground</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getWarrant <em>Warrant</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getClaim <em>Claim</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase()
  * @model
  * @generated
  */
 public interface SafetyCase extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Claim</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Claim</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Claim</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Claim</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_Claim()
 	 * @model required="true" ordered="false"
@@ -68,10 +70,10 @@ public interface SafetyCase extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_Base_Class()
@@ -84,7 +86,9 @@ public interface SafetyCase extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -94,10 +98,10 @@ public interface SafetyCase extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Context</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Context</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Context</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Context</em>' attribute.
 	 * @see #setContext(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_Context()
@@ -111,10 +115,10 @@ public interface SafetyCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ground</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Ground</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ground</em>' containment reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_Ground()
 	 * @model containment="true" required="true" ordered="false"
@@ -130,6 +134,7 @@ public interface SafetyCase extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Attached SafetyCases
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Safety Case</em>' containment reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_SafetyCase()
 	 * @model containment="true" ordered="false"
@@ -142,10 +147,10 @@ public interface SafetyCase extends TraceableSpecification {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Stage</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Stage</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Stage</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
 	 * @see #setStage(LifecycleStageKind)
@@ -160,10 +165,10 @@ public interface SafetyCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Warrant</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Warrant</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Warrant</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getSafetyCase_Warrant()
 	 * @model ordered="false"
@@ -175,7 +180,9 @@ public interface SafetyCase extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext <em>Context</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Context</em>' attribute.
 	 * @see #getContext()
 	 * @generated
 	 */
@@ -185,7 +192,9 @@ public interface SafetyCase extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getStage <em>Stage</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Stage</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Stage</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
 	 * @see #getStage()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycaseFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycaseFactory.java
index a31c7e53e34..6efe75446db 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycaseFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycaseFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage
  * @generated
  */
 public interface SafetycaseFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetycaseFactory eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycaseFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface SafetycaseFactory extends EFactory {
 	 * Returns a new object of class '<em>Claim</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Claim</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface SafetycaseFactory extends EFactory {
 	 * Returns a new object of class '<em>Ground</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Ground</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface SafetycaseFactory extends EFactory {
 	 * Returns a new object of class '<em>Safety Case</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Safety Case</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface SafetycaseFactory extends EFactory {
 	 * Returns a new object of class '<em>Warrant</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Warrant</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface SafetycaseFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycasePackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycasePackage.java
index 2403e13856b..97e3d4e2968 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycasePackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/SafetycasePackage.java
@@ -28,37 +28,48 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * Safety is a property of a system that is difficult to verify quantitatively since no clear measurement method exists that can be applied during the development. Not even exhaustive testing is feasible, as faults in electronics can have an intensity of 10^-9 faults/hour and still pose an unacceptable risk. Hence, it is only when enough field data have been collected from a system used in a particular context that it can be said to be safe enough. Nonetheless, safety must be addressed and assessed during development; restricted to qualitative reasoning about the safety of a product. A structured engineering method is thus needed to approach this problem. One such method is the so called safety case, which came originally from the nuclear industry.
+ * Safety is a property of a system that is difficult to verify quantitatively since no clear measurement method exists that can be applied during the
+ * development. Not even exhaustive testing is feasible, as faults in electronics can have an intensity of 10^-9 faults/hour and still pose an
+ * unacceptable risk. Hence, it is only when enough field data have been collected from a system used in a particular context that it can be said to
+ * be safe enough. Nonetheless, safety must be addressed and assessed during development; restricted to qualitative reasoning about the safety of a
+ * product. A structured engineering method is thus needed to approach this problem. One such method is the so called safety case, which came
+ * originally from the nuclear industry.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycaseFactory
  * @model kind="package"
  * @generated
  */
 public interface SafetycasePackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl <em>Safety Case</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl <em>Safety Case</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getSafetyCase()
 		 * @generated
@@ -69,6 +80,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Safety Case</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CASE__SAFETY_CASE = eINSTANCE.getSafetyCase_SafetyCase();
@@ -77,6 +89,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Stage</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SAFETY_CASE__STAGE = eINSTANCE.getSafetyCase_Stage();
@@ -85,6 +98,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Context</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SAFETY_CASE__CONTEXT = eINSTANCE.getSafetyCase_Context();
@@ -93,6 +107,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Ground</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CASE__GROUND = eINSTANCE.getSafetyCase_Ground();
@@ -101,6 +116,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Warrant</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CASE__WARRANT = eINSTANCE.getSafetyCase_Warrant();
@@ -109,6 +125,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Claim</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CASE__CLAIM = eINSTANCE.getSafetyCase_Claim();
@@ -117,6 +134,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CASE__BASE_CLASS = eINSTANCE.getSafetyCase_Base_Class();
@@ -125,6 +143,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl <em>Ground</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getGround()
 		 * @generated
@@ -135,6 +154,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Safety Evidence</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GROUND__SAFETY_EVIDENCE = eINSTANCE.getGround_SafetyEvidence();
@@ -143,6 +163,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GROUND__BASE_CLASS = eINSTANCE.getGround_Base_Class();
@@ -151,6 +172,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Justification</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GROUND__JUSTIFICATION = eINSTANCE.getGround_Justification();
@@ -159,6 +181,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl <em>Warrant</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getWarrant()
 		 * @generated
@@ -169,6 +192,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Decomposed Goal</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference WARRANT__DECOMPOSED_GOAL = eINSTANCE.getWarrant_DecomposedGoal();
@@ -177,6 +201,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Evidence</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference WARRANT__EVIDENCE = eINSTANCE.getWarrant_Evidence();
@@ -185,6 +210,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference WARRANT__BASE_CLASS = eINSTANCE.getWarrant_Base_Class();
@@ -193,6 +219,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Justification</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference WARRANT__JUSTIFICATION = eINSTANCE.getWarrant_Justification();
@@ -201,6 +228,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl <em>Claim</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getClaim()
 		 * @generated
@@ -211,6 +239,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Safety Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__SAFETY_REQUIREMENT = eINSTANCE.getClaim_SafetyRequirement();
@@ -219,6 +248,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Supported Argument</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__SUPPORTED_ARGUMENT = eINSTANCE.getClaim_SupportedArgument();
@@ -227,6 +257,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Goal Decomposition Strategy</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__GOAL_DECOMPOSITION_STRATEGY = eINSTANCE.getClaim_GoalDecompositionStrategy();
@@ -235,6 +266,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Evidence</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__EVIDENCE = eINSTANCE.getClaim_Evidence();
@@ -243,6 +275,7 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__BASE_CLASS = eINSTANCE.getClaim_Base_Class();
@@ -251,14 +284,17 @@ public interface SafetycasePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Justification</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAIM__JUSTIFICATION = eINSTANCE.getClaim_Justification();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind <em>Lifecycle Stage Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
+		 * <em>Lifecycle Stage Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getLifecycleStageKind()
 		 * @generated
@@ -271,6 +307,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "safetycase";
@@ -279,6 +316,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Dependability/SafetyCase/1";
@@ -287,6 +325,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "SafetyCase";
@@ -295,6 +334,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetycasePackage eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl.init();
@@ -303,6 +343,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl <em>Safety Case</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getSafetyCase()
 	 * @generated
@@ -313,6 +354,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -322,6 +364,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -331,6 +374,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -340,6 +384,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -349,6 +394,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -358,6 +404,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Case</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -367,6 +414,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Stage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -376,6 +424,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Context</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -385,6 +434,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Ground</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -394,6 +444,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Warrant</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -403,6 +454,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Claim</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -412,6 +464,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -421,6 +474,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The number of structural features of the '<em>Safety Case</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -430,6 +484,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl <em>Ground</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getGround()
 	 * @generated
@@ -440,6 +495,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -449,6 +505,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -458,6 +515,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -467,6 +525,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -476,6 +535,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -485,6 +545,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Evidence</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -494,6 +555,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -503,6 +565,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Justification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -512,6 +575,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The number of structural features of the '<em>Ground</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -521,6 +585,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl <em>Warrant</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getWarrant()
 	 * @generated
@@ -531,6 +596,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +606,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +616,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,6 +626,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -567,6 +636,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -576,6 +646,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Decomposed Goal</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -585,6 +656,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Evidence</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -594,6 +666,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -603,6 +676,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Justification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -612,6 +686,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The number of structural features of the '<em>Warrant</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -621,6 +696,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl <em>Claim</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getClaim()
 	 * @generated
@@ -631,6 +707,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -640,6 +717,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -649,6 +727,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -658,6 +737,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -667,6 +747,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -676,6 +757,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Safety Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -685,6 +767,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Supported Argument</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -694,6 +777,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Goal Decomposition Strategy</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -703,6 +787,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -712,6 +797,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Justification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -721,6 +807,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The feature id for the '<em><b>Evidence</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -730,6 +817,7 @@ public interface SafetycasePackage extends EPackage {
 	 * The number of structural features of the '<em>Claim</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -737,9 +825,11 @@ public interface SafetycasePackage extends EPackage {
 
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind <em>Lifecycle Stage Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind <em>Lifecycle Stage Kind</em>}'
+	 * enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetycasePackageImpl#getLifecycleStageKind()
 	 * @generated
@@ -750,6 +840,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim <em>Claim</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Claim</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim
 	 * @generated
@@ -757,9 +848,11 @@ public interface SafetycasePackage extends EPackage {
 	EClass getClaim();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getEvidence <em>Evidence</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getEvidence
+	 * <em>Evidence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Evidence</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getEvidence()
 	 * @see #getClaim()
@@ -768,9 +861,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getClaim_Evidence();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getGoalDecompositionStrategy <em>Goal Decomposition Strategy</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getGoalDecompositionStrategy
+	 * <em>Goal Decomposition Strategy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Goal Decomposition Strategy</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getGoalDecompositionStrategy()
 	 * @see #getClaim()
@@ -779,9 +874,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getClaim_GoalDecompositionStrategy();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class <em>Base Class</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getBase_Class()
 	 * @see #getClaim()
@@ -790,9 +887,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getClaim_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getJustification <em>Justification</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getJustification
+	 * <em>Justification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Justification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getJustification()
 	 * @see #getClaim()
@@ -801,9 +900,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getClaim_Justification();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSafetyRequirement <em>Safety Requirement</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSafetyRequirement
+	 * <em>Safety Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safety Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSafetyRequirement()
 	 * @see #getClaim()
@@ -812,9 +913,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getClaim_SafetyRequirement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSupportedArgument <em>Supported Argument</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSupportedArgument
+	 * <em>Supported Argument</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Supported Argument</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim#getSupportedArgument()
 	 * @see #getClaim()
@@ -826,6 +929,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground <em>Ground</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Ground</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Ground
 	 * @generated
@@ -833,9 +937,11 @@ public interface SafetycasePackage extends EPackage {
 	EClass getGround();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getJustification <em>Justification</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getJustification
+	 * <em>Justification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Justification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getJustification()
 	 * @see #getGround()
@@ -844,9 +950,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getGround_Justification();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getSafetyEvidence <em>Safety Evidence</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getSafetyEvidence
+	 * <em>Safety Evidence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safety Evidence</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getSafetyEvidence()
 	 * @see #getGround()
@@ -855,9 +963,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getGround_SafetyEvidence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Ground#getBase_Class()
 	 * @see #getGround()
@@ -866,9 +976,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getGround_Base_Class();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind <em>Lifecycle Stage Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind <em>Lifecycle Stage Kind</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Lifecycle Stage Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind
 	 * @generated
@@ -879,6 +991,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase <em>Safety Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Safety Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase
 	 * @generated
@@ -886,9 +999,11 @@ public interface SafetycasePackage extends EPackage {
 	EClass getSafetyCase();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getClaim <em>Claim</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getClaim <em>Claim</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Claim</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getClaim()
 	 * @see #getSafetyCase()
@@ -897,9 +1012,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getSafetyCase_Claim();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getBase_Class()
 	 * @see #getSafetyCase()
@@ -908,9 +1025,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getSafetyCase_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext <em>Context</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext <em>Context</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Context</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getContext()
 	 * @see #getSafetyCase()
@@ -919,9 +1038,11 @@ public interface SafetycasePackage extends EPackage {
 	EAttribute getSafetyCase_Context();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getGround <em>Ground</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getGround
+	 * <em>Ground</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Ground</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getGround()
 	 * @see #getSafetyCase()
@@ -930,9 +1051,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getSafetyCase_Ground();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getSafetyCase <em>Safety Case</em>}'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getSafetyCase <em>Safety Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Safety Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getSafetyCase()
 	 * @see #getSafetyCase()
@@ -944,6 +1067,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getStage <em>Stage</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Stage</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getStage()
 	 * @see #getSafetyCase()
@@ -952,9 +1076,11 @@ public interface SafetycasePackage extends EPackage {
 	EAttribute getSafetyCase_Stage();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getWarrant <em>Warrant</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getWarrant
+	 * <em>Warrant</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Warrant</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase#getWarrant()
 	 * @see #getSafetyCase()
@@ -966,6 +1092,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -975,6 +1102,7 @@ public interface SafetycasePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant <em>Warrant</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Warrant</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant
 	 * @generated
@@ -982,9 +1110,11 @@ public interface SafetycasePackage extends EPackage {
 	EClass getWarrant();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getDecomposedGoal <em>Decomposed Goal</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getDecomposedGoal
+	 * <em>Decomposed Goal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Decomposed Goal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getDecomposedGoal()
 	 * @see #getWarrant()
@@ -993,9 +1123,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getWarrant_DecomposedGoal();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getEvidence <em>Evidence</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getEvidence
+	 * <em>Evidence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Evidence</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getEvidence()
 	 * @see #getWarrant()
@@ -1004,9 +1136,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getWarrant_Evidence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class()
 	 * @see #getWarrant()
@@ -1015,9 +1149,11 @@ public interface SafetycasePackage extends EPackage {
 	EReference getWarrant_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getJustification <em>Justification</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getJustification
+	 * <em>Justification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Justification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getJustification()
 	 * @see #getWarrant()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Warrant.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Warrant.java
index eb3e79ff727..448d1a538d4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Warrant.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/Warrant.java
@@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.Comment;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Warrant</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Warrant represents argumentation of the facts to the Claim in general ways.
  * 
@@ -33,35 +33,37 @@ import org.eclipse.uml2.uml.Comment;
  * Semantics:
  * The overall objective of an argument is to lead the evidence to the claim.
  * 
- * Arguments are actions of inferring a conclusion from premised propositions. An argument is considered valid if the conclusion can be logically derived from its premises. An argument is considered sound if it is valid and all premises are true.
+ * Arguments are actions of inferring a conclusion from premised propositions. An argument is considered valid if the conclusion can be logically
+ * derived from its premises. An argument is considered sound if it is valid and all premises are true.
  * 
  * A goal decomposition strategy breaks down a goal into a number of sub-goals. It is recommended that the strategies are of specific form.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getDecomposedGoal <em>Decomposed Goal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getEvidence <em>Evidence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getDecomposedGoal <em>Decomposed Goal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getEvidence <em>Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getJustification <em>Justification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getWarrant()
  * @model
  * @generated
  */
 public interface Warrant extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Decomposed Goal</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Claim}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Decomposed Goal</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Decomposed Goal</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Decomposed Goal</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getWarrant_DecomposedGoal()
 	 * @model ordered="false"
@@ -74,10 +76,10 @@ public interface Warrant extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetycase.Ground}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Evidence</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Evidence</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Evidence</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getWarrant_Evidence()
 	 * @model ordered="false"
@@ -89,10 +91,10 @@ public interface Warrant extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getWarrant_Base_Class()
@@ -105,7 +107,9 @@ public interface Warrant extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -116,10 +120,10 @@ public interface Warrant extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.Comment}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Justification</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Justification</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#getWarrant_Justification()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/ClaimImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/ClaimImpl.java
index 45a4ab1cb54..8bff228506b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/ClaimImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/ClaimImpl.java
@@ -39,22 +39,24 @@ import org.eclipse.uml2.uml.Comment;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getSafetyRequirement <em>Safety Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getSupportedArgument <em>Supported Argument</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getGoalDecompositionStrategy <em>Goal Decomposition Strategy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getJustification <em>Justification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getEvidence <em>Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getSafetyRequirement <em>Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getSupportedArgument <em>Supported Argument</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getGoalDecompositionStrategy <em>Goal Decomposition Strategy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.ClaimImpl#getEvidence <em>Evidence</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
+
 	/**
 	 * The cached value of the '{@link #getSafetyRequirement() <em>Safety Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyRequirement()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	 * The cached value of the '{@link #getSupportedArgument() <em>Supported Argument</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSupportedArgument()
 	 * @generated
 	 * @ordered
@@ -75,6 +78,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	 * The cached value of the '{@link #getGoalDecompositionStrategy() <em>Goal Decomposition Strategy</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGoalDecompositionStrategy()
 	 * @generated
 	 * @ordered
@@ -85,6 +89,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -95,6 +100,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	 * The cached value of the '{@link #getJustification() <em>Justification</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJustification()
 	 * @generated
 	 * @ordered
@@ -105,6 +111,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	 * The cached value of the '{@link #getEvidence() <em>Evidence</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEvidence()
 	 * @generated
 	 * @ordered
@@ -114,6 +121,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClaimImpl() {
@@ -123,24 +131,26 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
-				return getSafetyRequirement();
-			case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
-				return getSupportedArgument();
-			case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
-				return getGoalDecompositionStrategy();
-			case SafetycasePackage.CLAIM__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetycasePackage.CLAIM__JUSTIFICATION:
-				return getJustification();
-			case SafetycasePackage.CLAIM__EVIDENCE:
-				return getEvidence();
+		switch(featureID) {
+		case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
+			return getSafetyRequirement();
+		case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
+			return getSupportedArgument();
+		case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
+			return getGoalDecompositionStrategy();
+		case SafetycasePackage.CLAIM__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetycasePackage.CLAIM__JUSTIFICATION:
+			return getJustification();
+		case SafetycasePackage.CLAIM__EVIDENCE:
+			return getEvidence();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -148,23 +158,24 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
-				return safetyRequirement != null && !safetyRequirement.isEmpty();
-			case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
-				return supportedArgument != null && !supportedArgument.isEmpty();
-			case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
-				return goalDecompositionStrategy != null && !goalDecompositionStrategy.isEmpty();
-			case SafetycasePackage.CLAIM__BASE_CLASS:
-				return base_Class != null;
-			case SafetycasePackage.CLAIM__JUSTIFICATION:
-				return justification != null && !justification.isEmpty();
-			case SafetycasePackage.CLAIM__EVIDENCE:
-				return evidence != null && !evidence.isEmpty();
+		switch(featureID) {
+		case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
+			return safetyRequirement != null && !safetyRequirement.isEmpty();
+		case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
+			return supportedArgument != null && !supportedArgument.isEmpty();
+		case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
+			return goalDecompositionStrategy != null && !goalDecompositionStrategy.isEmpty();
+		case SafetycasePackage.CLAIM__BASE_CLASS:
+			return base_Class != null;
+		case SafetycasePackage.CLAIM__JUSTIFICATION:
+			return justification != null && !justification.isEmpty();
+		case SafetycasePackage.CLAIM__EVIDENCE:
+			return evidence != null && !evidence.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -172,35 +183,36 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
-				getSafetyRequirement().clear();
-				getSafetyRequirement().addAll((Collection<? extends TraceableSpecification>)newValue);
-				return;
-			case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
-				getSupportedArgument().clear();
-				getSupportedArgument().addAll((Collection<? extends Warrant>)newValue);
-				return;
-			case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
-				getGoalDecompositionStrategy().clear();
-				getGoalDecompositionStrategy().addAll((Collection<? extends Warrant>)newValue);
-				return;
-			case SafetycasePackage.CLAIM__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetycasePackage.CLAIM__JUSTIFICATION:
-				getJustification().clear();
-				getJustification().addAll((Collection<? extends Comment>)newValue);
-				return;
-			case SafetycasePackage.CLAIM__EVIDENCE:
-				getEvidence().clear();
-				getEvidence().addAll((Collection<? extends Ground>)newValue);
-				return;
+		switch(featureID) {
+		case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
+			getSafetyRequirement().clear();
+			getSafetyRequirement().addAll((Collection<? extends TraceableSpecification>)newValue);
+			return;
+		case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
+			getSupportedArgument().clear();
+			getSupportedArgument().addAll((Collection<? extends Warrant>)newValue);
+			return;
+		case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
+			getGoalDecompositionStrategy().clear();
+			getGoalDecompositionStrategy().addAll((Collection<? extends Warrant>)newValue);
+			return;
+		case SafetycasePackage.CLAIM__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetycasePackage.CLAIM__JUSTIFICATION:
+			getJustification().clear();
+			getJustification().addAll((Collection<? extends Comment>)newValue);
+			return;
+		case SafetycasePackage.CLAIM__EVIDENCE:
+			getEvidence().clear();
+			getEvidence().addAll((Collection<? extends Ground>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -208,6 +220,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,29 +231,30 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
-				getSafetyRequirement().clear();
-				return;
-			case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
-				getSupportedArgument().clear();
-				return;
-			case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
-				getGoalDecompositionStrategy().clear();
-				return;
-			case SafetycasePackage.CLAIM__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetycasePackage.CLAIM__JUSTIFICATION:
-				getJustification().clear();
-				return;
-			case SafetycasePackage.CLAIM__EVIDENCE:
-				getEvidence().clear();
-				return;
+		switch(featureID) {
+		case SafetycasePackage.CLAIM__SAFETY_REQUIREMENT:
+			getSafetyRequirement().clear();
+			return;
+		case SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT:
+			getSupportedArgument().clear();
+			return;
+		case SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY:
+			getGoalDecompositionStrategy().clear();
+			return;
+		case SafetycasePackage.CLAIM__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetycasePackage.CLAIM__JUSTIFICATION:
+			getJustification().clear();
+			return;
+		case SafetycasePackage.CLAIM__EVIDENCE:
+			getEvidence().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -248,10 +262,11 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Ground> getEvidence() {
-		if (evidence == null) {
+		if(evidence == null) {
 			evidence = new EObjectResolvingEList<Ground>(Ground.class, this, SafetycasePackage.CLAIM__EVIDENCE);
 		}
 		return evidence;
@@ -260,10 +275,11 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Warrant> getGoalDecompositionStrategy() {
-		if (goalDecompositionStrategy == null) {
+		if(goalDecompositionStrategy == null) {
 			goalDecompositionStrategy = new EObjectResolvingEList<Warrant>(Warrant.class, this, SafetycasePackage.CLAIM__GOAL_DECOMPOSITION_STRATEGY);
 		}
 		return goalDecompositionStrategy;
@@ -272,14 +288,15 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetycasePackage.CLAIM__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -289,6 +306,7 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -298,22 +316,24 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.CLAIM__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getJustification() {
-		if (justification == null) {
+		if(justification == null) {
 			justification = new EObjectResolvingEList<Comment>(Comment.class, this, SafetycasePackage.CLAIM__JUSTIFICATION);
 		}
 		return justification;
@@ -322,10 +342,11 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TraceableSpecification> getSafetyRequirement() {
-		if (safetyRequirement == null) {
+		if(safetyRequirement == null) {
 			safetyRequirement = new EObjectResolvingEList<TraceableSpecification>(TraceableSpecification.class, this, SafetycasePackage.CLAIM__SAFETY_REQUIREMENT);
 		}
 		return safetyRequirement;
@@ -334,10 +355,11 @@ public class ClaimImpl extends TraceableSpecificationImpl implements Claim {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Warrant> getSupportedArgument() {
-		if (supportedArgument == null) {
+		if(supportedArgument == null) {
 			supportedArgument = new EObjectResolvingEList<Warrant>(Warrant.class, this, SafetycasePackage.CLAIM__SUPPORTED_ARGUMENT);
 		}
 		return supportedArgument;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/GroundImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/GroundImpl.java
index 575b560adfe..b65aee8ece8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/GroundImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/GroundImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getSafetyEvidence <em>Safety Evidence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getSafetyEvidence <em>Safety Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.GroundImpl#getJustification <em>Justification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GroundImpl extends TraceableSpecificationImpl implements Ground {
+
 	/**
 	 * The cached value of the '{@link #getSafetyEvidence() <em>Safety Evidence</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyEvidence()
 	 * @generated
 	 * @ordered
@@ -60,6 +62,7 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -70,6 +73,7 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	 * The cached value of the '{@link #getJustification() <em>Justification</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJustification()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GroundImpl() {
@@ -88,18 +93,20 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
-				return getSafetyEvidence();
-			case SafetycasePackage.GROUND__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetycasePackage.GROUND__JUSTIFICATION:
-				return getJustification();
+		switch(featureID) {
+		case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
+			return getSafetyEvidence();
+		case SafetycasePackage.GROUND__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetycasePackage.GROUND__JUSTIFICATION:
+			return getJustification();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +114,18 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
-				return safetyEvidence != null && !safetyEvidence.isEmpty();
-			case SafetycasePackage.GROUND__BASE_CLASS:
-				return base_Class != null;
-			case SafetycasePackage.GROUND__JUSTIFICATION:
-				return justification != null && !justification.isEmpty();
+		switch(featureID) {
+		case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
+			return safetyEvidence != null && !safetyEvidence.isEmpty();
+		case SafetycasePackage.GROUND__BASE_CLASS:
+			return base_Class != null;
+		case SafetycasePackage.GROUND__JUSTIFICATION:
+			return justification != null && !justification.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,23 +133,24 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
-				getSafetyEvidence().clear();
-				getSafetyEvidence().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case SafetycasePackage.GROUND__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetycasePackage.GROUND__JUSTIFICATION:
-				getJustification().clear();
-				getJustification().addAll((Collection<? extends Comment>)newValue);
-				return;
+		switch(featureID) {
+		case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
+			getSafetyEvidence().clear();
+			getSafetyEvidence().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case SafetycasePackage.GROUND__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetycasePackage.GROUND__JUSTIFICATION:
+			getJustification().clear();
+			getJustification().addAll((Collection<? extends Comment>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -149,6 +158,7 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,20 +169,21 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
-				getSafetyEvidence().clear();
-				return;
-			case SafetycasePackage.GROUND__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetycasePackage.GROUND__JUSTIFICATION:
-				getJustification().clear();
-				return;
+		switch(featureID) {
+		case SafetycasePackage.GROUND__SAFETY_EVIDENCE:
+			getSafetyEvidence().clear();
+			return;
+		case SafetycasePackage.GROUND__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetycasePackage.GROUND__JUSTIFICATION:
+			getJustification().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -180,10 +191,11 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getJustification() {
-		if (justification == null) {
+		if(justification == null) {
 			justification = new EObjectResolvingEList<Comment>(Comment.class, this, SafetycasePackage.GROUND__JUSTIFICATION);
 		}
 		return justification;
@@ -192,10 +204,11 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getSafetyEvidence() {
-		if (safetyEvidence == null) {
+		if(safetyEvidence == null) {
 			safetyEvidence = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, SafetycasePackage.GROUND__SAFETY_EVIDENCE);
 		}
 		return safetyEvidence;
@@ -204,14 +217,15 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetycasePackage.GROUND__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -221,6 +235,7 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -230,12 +245,13 @@ public class GroundImpl extends TraceableSpecificationImpl implements Ground {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.GROUND__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetyCaseImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetyCaseImpl.java
index 9eaf5e0e859..af30da4a0c4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetyCaseImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetyCaseImpl.java
@@ -42,23 +42,25 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getSafetyCase <em>Safety Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getStage <em>Stage</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getGround <em>Ground</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getWarrant <em>Warrant</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getClaim <em>Claim</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getSafetyCase <em>Safety Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getStage <em>Stage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getContext <em>Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getGround <em>Ground</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getWarrant <em>Warrant</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getClaim <em>Claim</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.SafetyCaseImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SafetyCaseImpl extends TraceableSpecificationImpl implements SafetyCase {
+
 	/**
 	 * The cached value of the '{@link #getSafetyCase() <em>Safety Case</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafetyCase()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The default value of the '{@link #getStage() <em>Stage</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getStage()
 	 * @generated
 	 * @ordered
@@ -79,6 +82,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getStage() <em>Stage</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getStage()
 	 * @generated
 	 * @ordered
@@ -89,6 +93,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The default value of the '{@link #getContext() <em>Context</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getContext()
 	 * @generated
 	 * @ordered
@@ -99,6 +104,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getContext() <em>Context</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getContext()
 	 * @generated
 	 * @ordered
@@ -109,6 +115,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getGround() <em>Ground</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGround()
 	 * @generated
 	 * @ordered
@@ -119,6 +126,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getWarrant() <em>Warrant</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWarrant()
 	 * @generated
 	 * @ordered
@@ -129,6 +137,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getClaim() <em>Claim</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClaim()
 	 * @generated
 	 * @ordered
@@ -139,6 +148,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -148,6 +158,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SafetyCaseImpl() {
@@ -157,26 +168,28 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
-				return getSafetyCase();
-			case SafetycasePackage.SAFETY_CASE__STAGE:
-				return getStage();
-			case SafetycasePackage.SAFETY_CASE__CONTEXT:
-				return getContext();
-			case SafetycasePackage.SAFETY_CASE__GROUND:
-				return getGround();
-			case SafetycasePackage.SAFETY_CASE__WARRANT:
-				return getWarrant();
-			case SafetycasePackage.SAFETY_CASE__CLAIM:
-				return getClaim();
-			case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
+			return getSafetyCase();
+		case SafetycasePackage.SAFETY_CASE__STAGE:
+			return getStage();
+		case SafetycasePackage.SAFETY_CASE__CONTEXT:
+			return getContext();
+		case SafetycasePackage.SAFETY_CASE__GROUND:
+			return getGround();
+		case SafetycasePackage.SAFETY_CASE__WARRANT:
+			return getWarrant();
+		case SafetycasePackage.SAFETY_CASE__CLAIM:
+			return getClaim();
+		case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -184,25 +197,26 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
-				return safetyCase != null && !safetyCase.isEmpty();
-			case SafetycasePackage.SAFETY_CASE__STAGE:
-				return stage != STAGE_EDEFAULT;
-			case SafetycasePackage.SAFETY_CASE__CONTEXT:
-				return CONTEXT_EDEFAULT == null ? context != null : !CONTEXT_EDEFAULT.equals(context);
-			case SafetycasePackage.SAFETY_CASE__GROUND:
-				return ground != null && !ground.isEmpty();
-			case SafetycasePackage.SAFETY_CASE__WARRANT:
-				return warrant != null && !warrant.isEmpty();
-			case SafetycasePackage.SAFETY_CASE__CLAIM:
-				return claim != null && !claim.isEmpty();
-			case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
+			return safetyCase != null && !safetyCase.isEmpty();
+		case SafetycasePackage.SAFETY_CASE__STAGE:
+			return stage != STAGE_EDEFAULT;
+		case SafetycasePackage.SAFETY_CASE__CONTEXT:
+			return CONTEXT_EDEFAULT == null ? context != null : !CONTEXT_EDEFAULT.equals(context);
+		case SafetycasePackage.SAFETY_CASE__GROUND:
+			return ground != null && !ground.isEmpty();
+		case SafetycasePackage.SAFETY_CASE__WARRANT:
+			return warrant != null && !warrant.isEmpty();
+		case SafetycasePackage.SAFETY_CASE__CLAIM:
+			return claim != null && !claim.isEmpty();
+		case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -210,37 +224,38 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
-				getSafetyCase().clear();
-				getSafetyCase().addAll((Collection<? extends SafetyCase>)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__STAGE:
-				setStage((LifecycleStageKind)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__CONTEXT:
-				setContext((String)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__GROUND:
-				getGround().clear();
-				getGround().addAll((Collection<? extends Ground>)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__WARRANT:
-				getWarrant().clear();
-				getWarrant().addAll((Collection<? extends Warrant>)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__CLAIM:
-				getClaim().clear();
-				getClaim().addAll((Collection<? extends Claim>)newValue);
-				return;
-			case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
+			getSafetyCase().clear();
+			getSafetyCase().addAll((Collection<? extends SafetyCase>)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__STAGE:
+			setStage((LifecycleStageKind)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__CONTEXT:
+			setContext((String)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__GROUND:
+			getGround().clear();
+			getGround().addAll((Collection<? extends Ground>)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__WARRANT:
+			getWarrant().clear();
+			getWarrant().addAll((Collection<? extends Warrant>)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__CLAIM:
+			getClaim().clear();
+			getClaim().addAll((Collection<? extends Claim>)newValue);
+			return;
+		case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -248,6 +263,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -258,32 +274,33 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
-				getSafetyCase().clear();
-				return;
-			case SafetycasePackage.SAFETY_CASE__STAGE:
-				setStage(STAGE_EDEFAULT);
-				return;
-			case SafetycasePackage.SAFETY_CASE__CONTEXT:
-				setContext(CONTEXT_EDEFAULT);
-				return;
-			case SafetycasePackage.SAFETY_CASE__GROUND:
-				getGround().clear();
-				return;
-			case SafetycasePackage.SAFETY_CASE__WARRANT:
-				getWarrant().clear();
-				return;
-			case SafetycasePackage.SAFETY_CASE__CLAIM:
-				getClaim().clear();
-				return;
-			case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
+			getSafetyCase().clear();
+			return;
+		case SafetycasePackage.SAFETY_CASE__STAGE:
+			setStage(STAGE_EDEFAULT);
+			return;
+		case SafetycasePackage.SAFETY_CASE__CONTEXT:
+			setContext(CONTEXT_EDEFAULT);
+			return;
+		case SafetycasePackage.SAFETY_CASE__GROUND:
+			getGround().clear();
+			return;
+		case SafetycasePackage.SAFETY_CASE__WARRANT:
+			getWarrant().clear();
+			return;
+		case SafetycasePackage.SAFETY_CASE__CLAIM:
+			getClaim().clear();
+			return;
+		case SafetycasePackage.SAFETY_CASE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -291,10 +308,11 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Claim> getClaim() {
-		if (claim == null) {
+		if(claim == null) {
 			claim = new EObjectResolvingEList<Claim>(Claim.class, this, SafetycasePackage.SAFETY_CASE__CLAIM);
 		}
 		return claim;
@@ -303,14 +321,15 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetycasePackage.SAFETY_CASE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -320,6 +339,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -329,27 +349,29 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.SAFETY_CASE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
-				return ((InternalEList<?>)getSafetyCase()).basicRemove(otherEnd, msgs);
-			case SafetycasePackage.SAFETY_CASE__GROUND:
-				return ((InternalEList<?>)getGround()).basicRemove(otherEnd, msgs);
+		switch(featureID) {
+		case SafetycasePackage.SAFETY_CASE__SAFETY_CASE:
+			return ((InternalEList<?>)getSafetyCase()).basicRemove(otherEnd, msgs);
+		case SafetycasePackage.SAFETY_CASE__GROUND:
+			return ((InternalEList<?>)getGround()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -357,6 +379,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getContext() {
@@ -366,10 +389,11 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Ground> getGround() {
-		if (ground == null) {
+		if(ground == null) {
 			ground = new EObjectContainmentEList<Ground>(Ground.class, this, SafetycasePackage.SAFETY_CASE__GROUND);
 		}
 		return ground;
@@ -378,10 +402,11 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<SafetyCase> getSafetyCase() {
-		if (safetyCase == null) {
+		if(safetyCase == null) {
 			safetyCase = new EObjectContainmentEList<SafetyCase>(SafetyCase.class, this, SafetycasePackage.SAFETY_CASE__SAFETY_CASE);
 		}
 		return safetyCase;
@@ -390,6 +415,7 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LifecycleStageKind getStage() {
@@ -399,10 +425,11 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Warrant> getWarrant() {
-		if (warrant == null) {
+		if(warrant == null) {
 			warrant = new EObjectResolvingEList<Warrant>(Warrant.class, this, SafetycasePackage.SAFETY_CASE__WARRANT);
 		}
 		return warrant;
@@ -411,35 +438,39 @@ public class SafetyCaseImpl extends TraceableSpecificationImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setContext(String newContext) {
 		String oldContext = context;
 		context = newContext;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.SAFETY_CASE__CONTEXT, oldContext, context));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStage(LifecycleStageKind newStage) {
 		LifecycleStageKind oldStage = stage;
 		stage = newStage == null ? STAGE_EDEFAULT : newStage;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.SAFETY_CASE__STAGE, oldStage, stage));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (stage: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycaseFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycaseFactoryImpl.java
index 13c649119c2..6e4917957a2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycaseFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycaseFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.dependability.safetycase.*;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Claim;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Ground;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.LifecycleStageKind;
@@ -34,12 +35,15 @@ import org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -52,16 +56,16 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SafetycaseFactory init() {
 		try {
 			SafetycaseFactory theSafetycaseFactory = (SafetycaseFactory)EPackage.Registry.INSTANCE.getEFactory(SafetycasePackage.eNS_URI);
-			if (theSafetycaseFactory != null) {
+			if(theSafetycaseFactory != null) {
 				return theSafetycaseFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new SafetycaseFactoryImpl();
@@ -71,6 +75,7 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseFactoryImpl() {
@@ -80,6 +85,7 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLifecycleStageKindToString(EDataType eDataType, Object instanceValue) {
@@ -89,38 +95,45 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case SafetycasePackage.LIFECYCLE_STAGE_KIND:
-				return convertLifecycleStageKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case SafetycasePackage.LIFECYCLE_STAGE_KIND:
+			return convertLifecycleStageKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SafetycasePackage.SAFETY_CASE: return createSafetyCase();
-			case SafetycasePackage.GROUND: return createGround();
-			case SafetycasePackage.WARRANT: return createWarrant();
-			case SafetycasePackage.CLAIM: return createClaim();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case SafetycasePackage.SAFETY_CASE:
+			return createSafetyCase();
+		case SafetycasePackage.GROUND:
+			return createGround();
+		case SafetycasePackage.WARRANT:
+			return createWarrant();
+		case SafetycasePackage.CLAIM:
+			return createClaim();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Claim createClaim() {
@@ -131,21 +144,23 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case SafetycasePackage.LIFECYCLE_STAGE_KIND:
-				return createLifecycleStageKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case SafetycasePackage.LIFECYCLE_STAGE_KIND:
+			return createLifecycleStageKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Ground createGround() {
@@ -156,17 +171,20 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LifecycleStageKind createLifecycleStageKindFromString(EDataType eDataType, String initialValue) {
 		LifecycleStageKind result = LifecycleStageKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyCase createSafetyCase() {
@@ -177,6 +195,7 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Warrant createWarrant() {
@@ -187,6 +206,7 @@ public class SafetycaseFactoryImpl extends EFactoryImpl implements SafetycaseFac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycasePackage getSafetycasePackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycasePackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycasePackageImpl.java
index 7ca8757498a..dd9c04bb190 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycasePackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/SafetycasePackageImpl.java
@@ -91,6 +91,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePackage {
@@ -98,6 +99,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass safetyCaseEClass = null;
@@ -105,6 +107,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass groundEClass = null;
@@ -112,6 +115,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass warrantEClass = null;
@@ -119,6 +123,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass claimEClass = null;
@@ -126,6 +131,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum lifecycleStageKindEEnum = null;
@@ -133,6 +139,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -140,16 +147,18 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * 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 SafetycasePackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link SafetycasePackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static SafetycasePackage init() {
-		if (isInited) return (SafetycasePackage)EPackage.Registry.INSTANCE.getEPackage(SafetycasePackage.eNS_URI);
+		if(isInited)
+			return (SafetycasePackage)EPackage.Registry.INSTANCE.getEPackage(SafetycasePackage.eNS_URI);
 
 		// Obtain or create and register package
 		SafetycasePackageImpl theSafetycasePackage = (SafetycasePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SafetycasePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SafetycasePackageImpl());
@@ -251,7 +260,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 		// Mark meta-data to indicate it can't be changed
 		theSafetycasePackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(SafetycasePackage.eNS_URI, theSafetycasePackage);
 		return theSafetycasePackage;
@@ -260,6 +269,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -267,19 +277,19 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage#eNS_URI
 	 * @see #init()
@@ -290,14 +300,16 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -336,6 +348,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getClaim() {
@@ -345,6 +358,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_Evidence() {
@@ -354,6 +368,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_GoalDecompositionStrategy() {
@@ -363,6 +378,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_Base_Class() {
@@ -372,6 +388,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_Justification() {
@@ -381,6 +398,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_SafetyRequirement() {
@@ -390,6 +408,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClaim_SupportedArgument() {
@@ -399,6 +418,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGround() {
@@ -408,6 +428,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGround_Justification() {
@@ -417,6 +438,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGround_SafetyEvidence() {
@@ -426,6 +448,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGround_Base_Class() {
@@ -435,6 +458,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getLifecycleStageKind() {
@@ -444,6 +468,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSafetyCase() {
@@ -453,6 +478,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyCase_Claim() {
@@ -462,6 +488,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyCase_Base_Class() {
@@ -471,6 +498,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSafetyCase_Context() {
@@ -480,6 +508,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyCase_Ground() {
@@ -489,6 +518,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyCase_SafetyCase() {
@@ -498,6 +528,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSafetyCase_Stage() {
@@ -507,6 +538,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyCase_Warrant() {
@@ -516,6 +548,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseFactory getSafetycaseFactory() {
@@ -525,6 +558,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getWarrant() {
@@ -534,6 +568,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getWarrant_DecomposedGoal() {
@@ -543,6 +578,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getWarrant_Evidence() {
@@ -552,6 +588,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getWarrant_Base_Class() {
@@ -561,6 +598,7 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getWarrant_Justification() {
@@ -568,14 +606,16 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -642,15 +682,12 @@ public class SafetycasePackageImpl extends EPackageImpl implements SafetycasePac
 	 * Initializes the annotations for <b>duplicates</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createDuplicatesAnnotations() {
-		String source = "duplicates";										
-		addAnnotation
-		  (claimEClass, 
-		   source, 
-		   new String[] {
-		   });	
+		String source = "duplicates";
+		addAnnotation(claimEClass, source, new String[]{});
 	}
 
 } //SafetycasePackageImpl
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/WarrantImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/WarrantImpl.java
index 4733d3f70c1..1cdf3f100e1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/WarrantImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/impl/WarrantImpl.java
@@ -38,20 +38,22 @@ import org.eclipse.uml2.uml.Comment;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getDecomposedGoal <em>Decomposed Goal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getEvidence <em>Evidence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getJustification <em>Justification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getDecomposedGoal <em>Decomposed Goal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getEvidence <em>Evidence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetycase.impl.WarrantImpl#getJustification <em>Justification</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
+
 	/**
 	 * The cached value of the '{@link #getDecomposedGoal() <em>Decomposed Goal</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDecomposedGoal()
 	 * @generated
 	 * @ordered
@@ -62,6 +64,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	 * The cached value of the '{@link #getEvidence() <em>Evidence</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEvidence()
 	 * @generated
 	 * @ordered
@@ -72,6 +75,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	 * The cached value of the '{@link #getJustification() <em>Justification</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJustification()
 	 * @generated
 	 * @ordered
@@ -91,6 +96,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected WarrantImpl() {
@@ -100,20 +106,22 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
-				return getDecomposedGoal();
-			case SafetycasePackage.WARRANT__EVIDENCE:
-				return getEvidence();
-			case SafetycasePackage.WARRANT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetycasePackage.WARRANT__JUSTIFICATION:
-				return getJustification();
+		switch(featureID) {
+		case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
+			return getDecomposedGoal();
+		case SafetycasePackage.WARRANT__EVIDENCE:
+			return getEvidence();
+		case SafetycasePackage.WARRANT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetycasePackage.WARRANT__JUSTIFICATION:
+			return getJustification();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -121,19 +129,20 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
-				return decomposedGoal != null && !decomposedGoal.isEmpty();
-			case SafetycasePackage.WARRANT__EVIDENCE:
-				return evidence != null && !evidence.isEmpty();
-			case SafetycasePackage.WARRANT__BASE_CLASS:
-				return base_Class != null;
-			case SafetycasePackage.WARRANT__JUSTIFICATION:
-				return justification != null && !justification.isEmpty();
+		switch(featureID) {
+		case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
+			return decomposedGoal != null && !decomposedGoal.isEmpty();
+		case SafetycasePackage.WARRANT__EVIDENCE:
+			return evidence != null && !evidence.isEmpty();
+		case SafetycasePackage.WARRANT__BASE_CLASS:
+			return base_Class != null;
+		case SafetycasePackage.WARRANT__JUSTIFICATION:
+			return justification != null && !justification.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -141,27 +150,28 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
-				getDecomposedGoal().clear();
-				getDecomposedGoal().addAll((Collection<? extends Claim>)newValue);
-				return;
-			case SafetycasePackage.WARRANT__EVIDENCE:
-				getEvidence().clear();
-				getEvidence().addAll((Collection<? extends Ground>)newValue);
-				return;
-			case SafetycasePackage.WARRANT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetycasePackage.WARRANT__JUSTIFICATION:
-				getJustification().clear();
-				getJustification().addAll((Collection<? extends Comment>)newValue);
-				return;
+		switch(featureID) {
+		case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
+			getDecomposedGoal().clear();
+			getDecomposedGoal().addAll((Collection<? extends Claim>)newValue);
+			return;
+		case SafetycasePackage.WARRANT__EVIDENCE:
+			getEvidence().clear();
+			getEvidence().addAll((Collection<? extends Ground>)newValue);
+			return;
+		case SafetycasePackage.WARRANT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetycasePackage.WARRANT__JUSTIFICATION:
+			getJustification().clear();
+			getJustification().addAll((Collection<? extends Comment>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -169,6 +179,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,23 +190,24 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
-				getDecomposedGoal().clear();
-				return;
-			case SafetycasePackage.WARRANT__EVIDENCE:
-				getEvidence().clear();
-				return;
-			case SafetycasePackage.WARRANT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetycasePackage.WARRANT__JUSTIFICATION:
-				getJustification().clear();
-				return;
+		switch(featureID) {
+		case SafetycasePackage.WARRANT__DECOMPOSED_GOAL:
+			getDecomposedGoal().clear();
+			return;
+		case SafetycasePackage.WARRANT__EVIDENCE:
+			getEvidence().clear();
+			return;
+		case SafetycasePackage.WARRANT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetycasePackage.WARRANT__JUSTIFICATION:
+			getJustification().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -203,10 +215,11 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Claim> getDecomposedGoal() {
-		if (decomposedGoal == null) {
+		if(decomposedGoal == null) {
 			decomposedGoal = new EObjectResolvingEList<Claim>(Claim.class, this, SafetycasePackage.WARRANT__DECOMPOSED_GOAL);
 		}
 		return decomposedGoal;
@@ -215,10 +228,11 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Ground> getEvidence() {
-		if (evidence == null) {
+		if(evidence == null) {
 			evidence = new EObjectResolvingEList<Ground>(Ground.class, this, SafetycasePackage.WARRANT__EVIDENCE);
 		}
 		return evidence;
@@ -227,14 +241,15 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetycasePackage.WARRANT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -244,6 +259,7 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -253,22 +269,24 @@ public class WarrantImpl extends TraceableSpecificationImpl implements Warrant {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetycasePackage.WARRANT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getJustification() {
-		if (justification == null) {
+		if(justification == null) {
 			justification = new EObjectResolvingEList<Comment>(Comment.class, this, SafetycasePackage.WARRANT__JUSTIFICATION);
 		}
 		return justification;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseAdapterFactory.java
index 9635af621f9..40ff6398121 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.dependability.safetycase.*;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Claim;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Ground;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase;
@@ -34,14 +35,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage
  * @generated
  */
 public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetycasePackage modelPackage;
@@ -50,52 +54,61 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected SafetycaseSwitch<Adapter> modelSwitch =
-		new SafetycaseSwitch<Adapter>() {
-			@Override
-			public Adapter caseSafetyCase(SafetyCase object) {
-				return createSafetyCaseAdapter();
-			}
-			@Override
-			public Adapter caseGround(Ground object) {
-				return createGroundAdapter();
-			}
-			@Override
-			public Adapter caseWarrant(Warrant object) {
-				return createWarrantAdapter();
-			}
-			@Override
-			public Adapter caseClaim(Claim object) {
-				return createClaimAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected SafetycaseSwitch<Adapter> modelSwitch = new SafetycaseSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseSafetyCase(SafetyCase object) {
+			return createSafetyCaseAdapter();
+		}
+
+		@Override
+		public Adapter caseGround(Ground object) {
+			return createGroundAdapter();
+		}
+
+		@Override
+		public Adapter caseWarrant(Warrant object) {
+			return createWarrantAdapter();
+		}
+
+		@Override
+		public Adapter caseClaim(Claim object) {
+			return createClaimAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetycasePackage.eINSTANCE;
 		}
 	}
@@ -104,7 +117,9 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -119,6 +134,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Claim
 	 * @generated
@@ -134,6 +150,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -143,11 +160,13 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -161,6 +180,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -174,6 +194,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Ground
 	 * @generated
@@ -188,6 +209,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase
 	 * @generated
@@ -197,11 +219,13 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -216,6 +240,7 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetycase.Warrant
 	 * @generated
@@ -229,15 +254,16 @@ public class SafetycaseAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceFactoryImpl.java
index 4c17440734a..98dcaf7decf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.util.SafetycaseResourceImpl
  * @generated
  */
 public class SafetycaseResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class SafetycaseResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceImpl.java
index a039e5c4e59..48ffc99e176 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.util.SafetycaseResourceFactoryImpl
  * @generated
  */
 public class SafetycaseResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public SafetycaseResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseSwitch.java
index b3acfd59f45..38a88e71f3b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.dependability.safetycase.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.dependability.safetycase.*;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Claim;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.Ground;
 import org.eclipse.papyrus.eastadl.dependability.safetycase.SafetyCase;
@@ -31,21 +32,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage
  * @generated
  */
 public class SafetycaseSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetycasePackage modelPackage;
@@ -54,10 +57,11 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetycasePackage.eINSTANCE;
 		}
 	}
@@ -66,6 +70,7 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -81,7 +86,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Claim</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -96,7 +103,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -111,7 +120,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -126,7 +137,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Ground</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -141,7 +154,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Safety Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -156,7 +171,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -171,7 +188,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Warrant</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -186,7 +205,9 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -200,49 +221,71 @@ public class SafetycaseSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SafetycasePackage.SAFETY_CASE: {
-				SafetyCase safetyCase = (SafetyCase)theEObject;
-				T result = caseSafetyCase(safetyCase);
-				if (result == null) result = caseTraceableSpecification(safetyCase);
-				if (result == null) result = caseEAPackageableElement(safetyCase);
-				if (result == null) result = caseEAElement(safetyCase);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetycasePackage.GROUND: {
-				Ground ground = (Ground)theEObject;
-				T result = caseGround(ground);
-				if (result == null) result = caseTraceableSpecification(ground);
-				if (result == null) result = caseEAPackageableElement(ground);
-				if (result == null) result = caseEAElement(ground);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetycasePackage.WARRANT: {
-				Warrant warrant = (Warrant)theEObject;
-				T result = caseWarrant(warrant);
-				if (result == null) result = caseTraceableSpecification(warrant);
-				if (result == null) result = caseEAPackageableElement(warrant);
-				if (result == null) result = caseEAElement(warrant);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetycasePackage.CLAIM: {
-				Claim claim = (Claim)theEObject;
-				T result = caseClaim(claim);
-				if (result == null) result = caseTraceableSpecification(claim);
-				if (result == null) result = caseEAPackageableElement(claim);
-				if (result == null) result = caseEAElement(claim);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case SafetycasePackage.SAFETY_CASE:
+		{
+			SafetyCase safetyCase = (SafetyCase)theEObject;
+			T result = caseSafetyCase(safetyCase);
+			if(result == null)
+				result = caseTraceableSpecification(safetyCase);
+			if(result == null)
+				result = caseEAPackageableElement(safetyCase);
+			if(result == null)
+				result = caseEAElement(safetyCase);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetycasePackage.GROUND:
+		{
+			Ground ground = (Ground)theEObject;
+			T result = caseGround(ground);
+			if(result == null)
+				result = caseTraceableSpecification(ground);
+			if(result == null)
+				result = caseEAPackageableElement(ground);
+			if(result == null)
+				result = caseEAElement(ground);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetycasePackage.WARRANT:
+		{
+			Warrant warrant = (Warrant)theEObject;
+			T result = caseWarrant(warrant);
+			if(result == null)
+				result = caseTraceableSpecification(warrant);
+			if(result == null)
+				result = caseEAPackageableElement(warrant);
+			if(result == null)
+				result = caseEAElement(warrant);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetycasePackage.CLAIM:
+		{
+			Claim claim = (Claim)theEObject;
+			T result = caseClaim(claim);
+			if(result == null)
+				result = caseTraceableSpecification(claim);
+			if(result == null)
+				result = caseEAPackageableElement(claim);
+			if(result == null)
+				result = caseEAElement(claim);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseXMLProcessor.java
index 78558199638..1c8578d3fe1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetycase/util/SafetycaseXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.dependability.safetycase.SafetycasePackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetycaseXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class SafetycaseXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetycaseXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		SafetycasePackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the SafetycaseResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new SafetycaseResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new SafetycaseResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/ASILKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/ASILKind.java
index b493850eba8..8253db2def4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/ASILKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/ASILKind.java
@@ -32,9 +32,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * Semantics:
  * The semantics is defined at each enumeration literal and fully defined in the ISO26262 standard.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getASILKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum ASILKind implements Enumerator {
 	 * The '<em><b>ASIL A</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASIL_A_VALUE
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public enum ASILKind implements Enumerator {
 	 * The '<em><b>ASIL D</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASIL_D_VALUE
 	 * @generated
 	 * @ordered
@@ -60,6 +63,7 @@ public enum ASILKind implements Enumerator {
 	 * The '<em><b>ASIL C</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASIL_C_VALUE
 	 * @generated
 	 * @ordered
@@ -68,6 +72,7 @@ public enum ASILKind implements Enumerator {
 	 * The '<em><b>ASIL B</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ASIL_B_VALUE
 	 * @generated
 	 * @ordered
@@ -76,6 +81,7 @@ public enum ASILKind implements Enumerator {
 	 * The '<em><b>QM</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #QM_VALUE
 	 * @generated
 	 * @ordered
@@ -89,6 +95,7 @@ public enum ASILKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * ASIL A, Lowest Safety Integrity Level.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #ASIL_A
 	 * @model
 	 * @generated
@@ -103,6 +110,7 @@ public enum ASILKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * ASIL D, Highest Safety Integrity Level.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #ASIL_D
 	 * @model
 	 * @generated
@@ -117,6 +125,7 @@ public enum ASILKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * ASIL C, second highest Safety Integrity Level.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #ASIL_C
 	 * @model
 	 * @generated
@@ -131,6 +140,7 @@ public enum ASILKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * ASIL B, second lowest Safety Integrity Level.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #ASIL_B
 	 * @model
 	 * @generated
@@ -145,6 +155,7 @@ public enum ASILKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Quality Management only, no requirement according to ISO 26262.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #QM
 	 * @model
 	 * @generated
@@ -156,21 +167,16 @@ public enum ASILKind implements Enumerator {
 	 * An array of all the '<em><b>ASIL Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ASILKind[] VALUES_ARRAY =
-		new ASILKind[] {
-			ASIL_A,
-			ASIL_D,
-			ASIL_C,
-			ASIL_B,
-			QM,
-		};
+	private static final ASILKind[] VALUES_ARRAY = new ASILKind[]{ ASIL_A, ASIL_D, ASIL_C, ASIL_B, QM, };
 
 	/**
 	 * A public read-only list of all the '<em><b>ASIL Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ASILKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -179,15 +185,21 @@ public enum ASILKind implements Enumerator {
 	 * Returns the '<em><b>ASIL Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ASILKind get(int value) {
-		switch (value) {
-			case ASIL_A_VALUE: return ASIL_A;
-			case ASIL_D_VALUE: return ASIL_D;
-			case ASIL_C_VALUE: return ASIL_C;
-			case ASIL_B_VALUE: return ASIL_B;
-			case QM_VALUE: return QM;
+		switch(value) {
+		case ASIL_A_VALUE:
+			return ASIL_A;
+		case ASIL_D_VALUE:
+			return ASIL_D;
+		case ASIL_C_VALUE:
+			return ASIL_C;
+		case ASIL_B_VALUE:
+			return ASIL_B;
+		case QM_VALUE:
+			return QM;
 		}
 		return null;
 	}
@@ -196,12 +208,13 @@ public enum ASILKind implements Enumerator {
 	 * Returns the '<em><b>ASIL Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ASILKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ASILKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -212,12 +225,13 @@ public enum ASILKind implements Enumerator {
 	 * Returns the '<em><b>ASIL Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ASILKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ASILKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -227,6 +241,7 @@ public enum ASILKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -234,6 +249,7 @@ public enum ASILKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -241,6 +257,7 @@ public enum ASILKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -249,6 +266,7 @@ public enum ASILKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ASILKind(int value, String name, String literal) {
@@ -260,39 +278,43 @@ public enum ASILKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //ASILKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/FaultFailure.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/FaultFailure.java
index 373435de477..6d8be619019 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/FaultFailure.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/FaultFailure.java
@@ -22,36 +22,38 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Fault Failure</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The FaultFailure represents a certain fault or failure on its referenced Anomaly. The faultFailureValue specifies the value of the Anomaly that the FaultFailure corresponds to, i.e. one of the possible values of the Anomaly. 
+ * The FaultFailure represents a certain fault or failure on its referenced Anomaly. The faultFailureValue specifies the value of the Anomaly that the
+ * FaultFailure corresponds to, i.e. one of the possible values of the Anomaly.
  * 
  * Semantics:
  * A FaultFailure is defined as a certain value, faultFailureValue, occurring at the referenced Anomaly.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue <em>Fault Failure Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly <em>Anomaly</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue <em>Fault Failure Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly <em>Anomaly</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getFaultFailure()
  * @model
  * @generated
  */
 public interface FaultFailure extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getFaultFailure_Base_Class()
@@ -61,10 +63,13 @@ public interface FaultFailure extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -74,10 +79,10 @@ public interface FaultFailure extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Anomaly</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Anomaly</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Anomaly</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Anomaly</em>' reference.
 	 * @see #setAnomaly(Anomaly)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getFaultFailure_Anomaly()
@@ -90,10 +95,10 @@ public interface FaultFailure extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Fault Failure Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fault Failure Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Fault Failure Value</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fault Failure Value</em>' attribute.
 	 * @see #setFaultFailureValue(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getFaultFailure_FaultFailureValue()
@@ -106,17 +111,22 @@ public interface FaultFailure extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly <em>Anomaly</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Anomaly</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Anomaly</em>' reference.
 	 * @see #getAnomaly()
 	 * @generated
 	 */
 	void setAnomaly(Anomaly value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue <em>Fault Failure Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue
+	 * <em>Fault Failure Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fault Failure Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Fault Failure Value</em>' attribute.
 	 * @see #getFaultFailureValue()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/QuantitativeSafetyConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/QuantitativeSafetyConstraint.java
index 37bee17a3d8..37e1ef66b61 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/QuantitativeSafetyConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/QuantitativeSafetyConstraint.java
@@ -24,42 +24,46 @@ import org.eclipse.uml2.uml.Constraint;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Quantitative Safety Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The QuantitativeSafetyConstraint metaclass represents the quantitative integrity constraints on a fault or failure. Thus, the system has same or better performance with respect to the constrained fault or failure, and depending on the role this is either a requirement or a property.
+ * The QuantitativeSafetyConstraint metaclass represents the quantitative integrity constraints on a fault or failure. Thus, the system has same or
+ * better performance with respect to the constrained fault or failure, and depending on the role this is either a requirement or a property.
  * 
  * Semantics:
- * A QuantitativeSafetyConstraint provides information about the probabilistic estimates of target faults/failures, further specified by the failureRate and repairRate attribute.
+ * A QuantitativeSafetyConstraint provides information about the probabilistic estimates of target faults/failures, further specified by the
+ * failureRate and repairRate attribute.
  * 
  * Extension:
  * (see ADLTraceableSpecification)
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate <em>Failure Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate <em>Repair Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getConstrainedFaultFailure <em>Constrained
+ * Fault Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate <em>Failure Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate <em>Repair Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint()
  * @model
  * @generated
  */
 public interface QuantitativeSafetyConstraint extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Constrained Fault Failure</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Constrained Fault Failure</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Constrained Fault Failure</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Constrained Fault Failure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint_ConstrainedFaultFailure()
 	 * @model required="true" ordered="false"
@@ -71,10 +75,10 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Failure Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Failure Rate</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Failure Rate</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Failure Rate</em>' attribute.
 	 * @see #setFailureRate(Float)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint_FailureRate()
@@ -87,10 +91,10 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Repair Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Repair Rate</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Repair Rate</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Repair Rate</em>' attribute.
 	 * @see #setRepairRate(Float)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint_RepairRate()
@@ -100,20 +104,26 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	Float getRepairRate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate <em>Failure Rate</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate
+	 * <em>Failure Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Failure Rate</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Failure Rate</em>' attribute.
 	 * @see #getFailureRate()
 	 * @generated
 	 */
 	void setFailureRate(Float value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate <em>Repair Rate</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate
+	 * <em>Repair Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repair Rate</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Repair Rate</em>' attribute.
 	 * @see #getRepairRate()
 	 * @generated
 	 */
@@ -123,10 +133,10 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint_Base_Class()
@@ -136,10 +146,13 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -149,10 +162,10 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Constraint</em>' reference.
 	 * @see #setBase_Constraint(Constraint)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getQuantitativeSafetyConstraint_Base_Constraint()
@@ -162,10 +175,13 @@ public interface QuantitativeSafetyConstraint extends TraceableSpecification {
 	Constraint getBase_Constraint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint
+	 * <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Constraint</em>' reference.
 	 * @see #getBase_Constraint()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyConstraint.java
index 42f368dd875..1054d0ca5f6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyConstraint.java
@@ -24,44 +24,47 @@ import org.eclipse.uml2.uml.Constraint;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Safety Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The SafetyConstraint metaclass represents the qualitative integrity constraints on a fault or failure. Thus, the system has same or better performance with respect to the constrained fault or failure, and depending on the role this is either a requirement or a property.
+ * The SafetyConstraint metaclass represents the qualitative integrity constraints on a fault or failure. Thus, the system has same or better
+ * performance with respect to the constrained fault or failure, and depending on the role this is either a requirement or a property.
  * 
  * Semantics:
  * A SafetyConstraint defines qualitative bounds on the constrainedFaultFailure in terms of safety integrity level, asilValue.
  * 
- * Depending on role, the SafetyConstraint may define a required or an actual safety integrity level. 
+ * Depending on role, the SafetyConstraint may define a required or an actual safety integrity level.
  * 
  * 
  * Extension:
  * (see ADLTraceableSpecification)
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue <em>Asil Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue <em>Asil Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getConstrainedFaultFailure <em>Constrained Fault Failure
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getSafetyConstraint()
  * @model
  * @generated
  */
 public interface SafetyConstraint extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Asil Value</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Asil Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Asil Value</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Asil Value</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #setAsilValue(ASILKind)
@@ -72,10 +75,13 @@ public interface SafetyConstraint extends TraceableSpecification {
 	ASILKind getAsilValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue <em>Asil Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue <em>Asil Value</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Asil Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Asil Value</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #getAsilValue()
 	 * @generated
@@ -87,10 +93,10 @@ public interface SafetyConstraint extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Constrained Fault Failure</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Constrained Fault Failure</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Constrained Fault Failure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getSafetyConstraint_ConstrainedFaultFailure()
 	 * @model required="true" ordered="false"
@@ -102,10 +108,10 @@ public interface SafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getSafetyConstraint_Base_Class()
@@ -115,10 +121,13 @@ public interface SafetyConstraint extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -128,10 +137,10 @@ public interface SafetyConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Constraint</em>' reference.
 	 * @see #setBase_Constraint(Constraint)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#getSafetyConstraint_Base_Constraint()
@@ -141,10 +150,13 @@ public interface SafetyConstraint extends TraceableSpecification {
 	Constraint getBase_Constraint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint
+	 * <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Constraint</em>' reference.
 	 * @see #getBase_Constraint()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsFactory.java
index 42564ca888f..8c277b9f8a7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage
  * @generated
  */
 public interface SafetyconstraintsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetyconstraintsFactory eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface SafetyconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Fault Failure</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Fault Failure</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface SafetyconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Quantitative Safety Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Quantitative Safety Constraint</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface SafetyconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Safety Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Safety Constraint</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface SafetyconstraintsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsPackage.java
index 919b9b5c6a8..ee1a0ad8fa1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/SafetyconstraintsPackage.java
@@ -28,145 +28,183 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsFactory
  * @model kind="package"
  * @generated
  */
 public interface SafetyconstraintsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl <em>Safety Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl
+		 * <em>Safety Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getSafetyConstraint()
 		 * @generated
 		 */
 		EClass SAFETY_CONSTRAINT = eINSTANCE.getSafetyConstraint();
+
 		/**
 		 * The meta object literal for the '<em><b>Asil Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SAFETY_CONSTRAINT__ASIL_VALUE = eINSTANCE.getSafetyConstraint_AsilValue();
+
 		/**
 		 * The meta object literal for the '<em><b>Constrained Fault Failure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE = eINSTANCE.getSafetyConstraint_ConstrainedFaultFailure();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CONSTRAINT__BASE_CLASS = eINSTANCE.getSafetyConstraint_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getSafetyConstraint_Base_Constraint();
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl <em>Quantitative Safety Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl
+		 * <em>Quantitative Safety Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getQuantitativeSafetyConstraint()
 		 * @generated
 		 */
 		EClass QUANTITATIVE_SAFETY_CONSTRAINT = eINSTANCE.getQuantitativeSafetyConstraint();
+
 		/**
 		 * The meta object literal for the '<em><b>Constrained Fault Failure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE = eINSTANCE.getQuantitativeSafetyConstraint_ConstrainedFaultFailure();
+
 		/**
 		 * The meta object literal for the '<em><b>Failure Rate</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE = eINSTANCE.getQuantitativeSafetyConstraint_FailureRate();
+
 		/**
 		 * The meta object literal for the '<em><b>Repair Rate</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE = eINSTANCE.getQuantitativeSafetyConstraint_RepairRate();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS = eINSTANCE.getQuantitativeSafetyConstraint_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getQuantitativeSafetyConstraint_Base_Constraint();
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl <em>Fault Failure</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl
+		 * <em>Fault Failure</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getFaultFailure()
 		 * @generated
 		 */
 		EClass FAULT_FAILURE = eINSTANCE.getFaultFailure();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE__BASE_CLASS = eINSTANCE.getFaultFailure_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Fault Failure Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FAULT_FAILURE__FAULT_FAILURE_VALUE = eINSTANCE.getFaultFailure_FaultFailureValue();
+
 		/**
 		 * The meta object literal for the '<em><b>Anomaly</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FAULT_FAILURE__ANOMALY = eINSTANCE.getFaultFailure_Anomaly();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind <em>ASIL Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getASILKind()
 		 * @generated
@@ -179,6 +217,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "safetyconstraints";
@@ -187,6 +226,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Dependability/SafetyConstraints/1";
@@ -195,6 +235,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "SafetyConstraints";
@@ -203,15 +244,18 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetyconstraintsPackage eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl.init();
 
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl <em>Safety Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl
+	 * <em>Safety Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getSafetyConstraint()
 	 * @generated
@@ -219,9 +263,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	int SAFETY_CONSTRAINT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl <em>Quantitative Safety Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl
+	 * <em>Quantitative Safety Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getQuantitativeSafetyConstraint()
 	 * @generated
@@ -229,9 +275,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	int QUANTITATIVE_SAFETY_CONSTRAINT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl <em>Fault Failure</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl <em>Fault Failure</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getFaultFailure()
 	 * @generated
@@ -242,6 +290,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -251,6 +300,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -260,6 +310,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -269,6 +320,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -278,6 +330,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -287,6 +340,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -296,6 +350,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Fault Failure Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -305,6 +360,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Anomaly</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -314,6 +370,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Fault Failure</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -323,6 +380,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -332,6 +390,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -341,6 +400,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -350,6 +410,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -359,6 +420,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -368,6 +430,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Asil Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -377,6 +440,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Constrained Fault Failure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -386,6 +450,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -395,6 +460,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -404,6 +470,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Safety Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -413,6 +480,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -422,6 +490,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -431,6 +500,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -440,6 +510,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -449,6 +520,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -458,6 +530,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Constrained Fault Failure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -467,6 +540,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Failure Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -476,6 +550,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Repair Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -485,6 +560,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -494,6 +570,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -503,6 +580,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Quantitative Safety Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -512,6 +590,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind <em>ASIL Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyconstraintsPackageImpl#getASILKind()
 	 * @generated
@@ -522,6 +601,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure <em>Fault Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fault Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure
 	 * @generated
@@ -529,9 +609,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EClass getFaultFailure();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getBase_Class()
 	 * @see #getFaultFailure()
@@ -540,9 +622,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getFaultFailure_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly <em>Anomaly</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly
+	 * <em>Anomaly</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Anomaly</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getAnomaly()
 	 * @see #getFaultFailure()
@@ -551,9 +635,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getFaultFailure_Anomaly();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue <em>Fault Failure Value</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue <em>Fault Failure Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fault Failure Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure#getFaultFailureValue()
 	 * @see #getFaultFailure()
@@ -562,9 +648,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EAttribute getFaultFailure_FaultFailureValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint
+	 * <em>Quantitative Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Quantitative Safety Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint
 	 * @generated
@@ -572,9 +660,12 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EClass getQuantitativeSafetyConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getConstrainedFaultFailure
+	 * <em>Constrained Fault Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Constrained Fault Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getConstrainedFaultFailure()
 	 * @see #getQuantitativeSafetyConstraint()
@@ -583,9 +674,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getQuantitativeSafetyConstraint_ConstrainedFaultFailure();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate <em>Failure Rate</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate <em>Failure Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Failure Rate</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getFailureRate()
 	 * @see #getQuantitativeSafetyConstraint()
@@ -594,9 +687,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EAttribute getQuantitativeSafetyConstraint_FailureRate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate <em>Repair Rate</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate <em>Repair Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Repair Rate</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getRepairRate()
 	 * @see #getQuantitativeSafetyConstraint()
@@ -605,9 +700,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EAttribute getQuantitativeSafetyConstraint_RepairRate();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Class()
 	 * @see #getQuantitativeSafetyConstraint()
@@ -616,9 +713,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getQuantitativeSafetyConstraint_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint <em>Base Constraint</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint <em>Base Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint#getBase_Constraint()
 	 * @see #getQuantitativeSafetyConstraint()
@@ -630,6 +729,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind <em>ASIL Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>ASIL Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @generated
@@ -637,9 +737,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EEnum getASILKind();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint <em>Safety Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint
+	 * <em>Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Safety Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint
 	 * @generated
@@ -647,9 +749,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EClass getSafetyConstraint();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue <em>Asil Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue
+	 * <em>Asil Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Asil Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getAsilValue()
 	 * @see #getSafetyConstraint()
@@ -658,9 +762,12 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EAttribute getSafetyConstraint_AsilValue();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getConstrainedFaultFailure
+	 * <em>Constrained Fault Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Constrained Fault Failure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getConstrainedFaultFailure()
 	 * @see #getSafetyConstraint()
@@ -669,9 +776,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getSafetyConstraint_ConstrainedFaultFailure();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Class()
 	 * @see #getSafetyConstraint()
@@ -680,9 +789,11 @@ public interface SafetyconstraintsPackage extends EPackage {
 	EReference getSafetyConstraint_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint <em>Base Constraint</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint <em>Base Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint#getBase_Constraint()
 	 * @see #getSafetyConstraint()
@@ -694,6 +805,7 @@ public interface SafetyconstraintsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/FaultFailureImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/FaultFailureImpl.java
index f2514ec07e9..f8346693b86 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/FaultFailureImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/FaultFailureImpl.java
@@ -32,19 +32,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecifi
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getFaultFailureValue <em>Fault Failure Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getAnomaly <em>Anomaly</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getFaultFailureValue <em>Fault Failure Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.FaultFailureImpl#getAnomaly <em>Anomaly</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FaultFailureImpl extends TraceableSpecificationImpl implements FaultFailure {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	 * The default value of the '{@link #getFaultFailureValue() <em>Fault Failure Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFaultFailureValue()
 	 * @generated
 	 * @ordered
@@ -65,6 +68,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	 * The cached value of the '{@link #getFaultFailureValue() <em>Fault Failure Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFaultFailureValue()
 	 * @generated
 	 * @ordered
@@ -75,6 +79,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	 * The cached value of the '{@link #getAnomaly() <em>Anomaly</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAnomaly()
 	 * @generated
 	 * @ordered
@@ -84,6 +89,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FaultFailureImpl() {
@@ -93,6 +99,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Anomaly basicGetAnomaly() {
@@ -102,19 +109,22 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
-				return getFaultFailureValue();
-			case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
-				if (resolve) return getAnomaly();
-				return basicGetAnomaly();
+		switch(featureID) {
+		case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
+			return getFaultFailureValue();
+		case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
+			if(resolve)
+				return getAnomaly();
+			return basicGetAnomaly();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -122,17 +132,18 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
-				return base_Class != null;
-			case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
-				return FAULT_FAILURE_VALUE_EDEFAULT == null ? faultFailureValue != null : !FAULT_FAILURE_VALUE_EDEFAULT.equals(faultFailureValue);
-			case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
-				return anomaly != null;
+		switch(featureID) {
+		case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
+			return base_Class != null;
+		case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
+			return FAULT_FAILURE_VALUE_EDEFAULT == null ? faultFailureValue != null : !FAULT_FAILURE_VALUE_EDEFAULT.equals(faultFailureValue);
+		case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
+			return anomaly != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -140,20 +151,21 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
-				setFaultFailureValue((String)newValue);
-				return;
-			case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
-				setAnomaly((Anomaly)newValue);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
+			setFaultFailureValue((String)newValue);
+			return;
+		case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
+			setAnomaly((Anomaly)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -161,6 +173,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -171,14 +184,15 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -188,6 +202,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -197,32 +212,34 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
-				setFaultFailureValue(FAULT_FAILURE_VALUE_EDEFAULT);
-				return;
-			case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
-				setAnomaly((Anomaly)null);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.FAULT_FAILURE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE:
+			setFaultFailureValue(FAULT_FAILURE_VALUE_EDEFAULT);
+			return;
+		case SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY:
+			setAnomaly((Anomaly)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -230,14 +247,15 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Anomaly getAnomaly() {
-		if (anomaly != null && anomaly.eIsProxy()) {
+		if(anomaly != null && anomaly.eIsProxy()) {
 			InternalEObject oldAnomaly = (InternalEObject)anomaly;
 			anomaly = (Anomaly)eResolveProxy(oldAnomaly);
-			if (anomaly != oldAnomaly) {
-				if (eNotificationRequired())
+			if(anomaly != oldAnomaly) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY, oldAnomaly, anomaly));
 			}
 		}
@@ -247,6 +265,7 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFaultFailureValue() {
@@ -256,35 +275,39 @@ public class FaultFailureImpl extends TraceableSpecificationImpl implements Faul
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAnomaly(Anomaly newAnomaly) {
 		Anomaly oldAnomaly = anomaly;
 		anomaly = newAnomaly;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.FAULT_FAILURE__ANOMALY, oldAnomaly, anomaly));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFaultFailureValue(String newFaultFailureValue) {
 		String oldFaultFailureValue = faultFailureValue;
 		faultFailureValue = newFaultFailureValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.FAULT_FAILURE__FAULT_FAILURE_VALUE, oldFaultFailureValue, faultFailureValue));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (faultFailureValue: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/QuantitativeSafetyConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/QuantitativeSafetyConstraintImpl.java
index 344972c3bdc..1e0de210ce8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/QuantitativeSafetyConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/QuantitativeSafetyConstraintImpl.java
@@ -37,21 +37,25 @@ import org.eclipse.uml2.uml.Constraint;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getFailureRate <em>Failure Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getRepairRate <em>Repair Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getConstrainedFaultFailure <em>
+ * Constrained Fault Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getFailureRate <em>Failure Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getRepairRate <em>Repair Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.QuantitativeSafetyConstraintImpl#getBase_Constraint <em>Base Constraint
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl implements QuantitativeSafetyConstraint {
+
 	/**
 	 * The cached value of the '{@link #getConstrainedFaultFailure() <em>Constrained Fault Failure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConstrainedFaultFailure()
 	 * @generated
 	 * @ordered
@@ -62,6 +66,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The default value of the '{@link #getFailureRate() <em>Failure Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFailureRate()
 	 * @generated
 	 * @ordered
@@ -72,6 +77,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The cached value of the '{@link #getFailureRate() <em>Failure Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFailureRate()
 	 * @generated
 	 * @ordered
@@ -82,6 +88,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The default value of the '{@link #getRepairRate() <em>Repair Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepairRate()
 	 * @generated
 	 * @ordered
@@ -92,6 +99,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The cached value of the '{@link #getRepairRate() <em>Repair Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRepairRate()
 	 * @generated
 	 * @ordered
@@ -102,6 +110,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -112,6 +121,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Constraint()
 	 * @generated
 	 * @ordered
@@ -121,6 +131,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected QuantitativeSafetyConstraintImpl() {
@@ -130,23 +141,26 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				return getConstrainedFaultFailure();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
-				return getFailureRate();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
-				return getRepairRate();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
+		switch(featureID) {
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			return getConstrainedFaultFailure();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
+			return getFailureRate();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
+			return getRepairRate();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			if(resolve)
+				return getBase_Constraint();
+			return basicGetBase_Constraint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -154,21 +168,22 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				return constrainedFaultFailure != null && !constrainedFaultFailure.isEmpty();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
-				return FAILURE_RATE_EDEFAULT == null ? failureRate != null : !FAILURE_RATE_EDEFAULT.equals(failureRate);
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
-				return REPAIR_RATE_EDEFAULT == null ? repairRate != null : !REPAIR_RATE_EDEFAULT.equals(repairRate);
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
-				return base_Class != null;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				return base_Constraint != null;
+		switch(featureID) {
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			return constrainedFaultFailure != null && !constrainedFaultFailure.isEmpty();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
+			return FAILURE_RATE_EDEFAULT == null ? failureRate != null : !FAILURE_RATE_EDEFAULT.equals(failureRate);
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
+			return REPAIR_RATE_EDEFAULT == null ? repairRate != null : !REPAIR_RATE_EDEFAULT.equals(repairRate);
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
+			return base_Class != null;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			return base_Constraint != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -176,28 +191,29 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				getConstrainedFaultFailure().clear();
-				getConstrainedFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
-				setFailureRate((Float)newValue);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
-				setRepairRate((Float)newValue);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			getConstrainedFaultFailure().clear();
+			getConstrainedFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
+			setFailureRate((Float)newValue);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
+			setRepairRate((Float)newValue);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -205,6 +221,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,26 +232,27 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				getConstrainedFaultFailure().clear();
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
-				setFailureRate(FAILURE_RATE_EDEFAULT);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
-				setRepairRate(REPAIR_RATE_EDEFAULT);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			getConstrainedFaultFailure().clear();
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE:
+			setFailureRate(FAILURE_RATE_EDEFAULT);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE:
+			setRepairRate(REPAIR_RATE_EDEFAULT);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -242,10 +260,11 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FaultFailure> getConstrainedFaultFailure() {
-		if (constrainedFaultFailure == null) {
+		if(constrainedFaultFailure == null) {
 			constrainedFaultFailure = new EObjectResolvingEList<FaultFailure>(FaultFailure.class, this, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE);
 		}
 		return constrainedFaultFailure;
@@ -254,6 +273,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getFailureRate() {
@@ -263,6 +283,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getRepairRate() {
@@ -272,38 +293,41 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFailureRate(Float newFailureRate) {
 		Float oldFailureRate = failureRate;
 		failureRate = newFailureRate;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__FAILURE_RATE, oldFailureRate, failureRate));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRepairRate(Float newRepairRate) {
 		Float oldRepairRate = repairRate;
 		repairRate = newRepairRate;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__REPAIR_RATE, oldRepairRate, repairRate));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -313,6 +337,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -322,26 +347,28 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
+		if(base_Constraint != null && base_Constraint.eIsProxy()) {
 			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
 			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
+			if(base_Constraint != oldBase_Constraint) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 			}
 		}
@@ -351,6 +378,7 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint basicGetBase_Constraint() {
@@ -360,23 +388,26 @@ public class QuantitativeSafetyConstraintImpl extends TraceableSpecificationImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Constraint(Constraint newBase_Constraint) {
 		Constraint oldBase_Constraint = base_Constraint;
 		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (failureRate: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyConstraintImpl.java
index 266980b568a..bfded8d76a7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyConstraintImpl.java
@@ -38,20 +38,23 @@ import org.eclipse.uml2.uml.Constraint;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getAsilValue <em>Asil Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getConstrainedFaultFailure <em>Constrained Fault Failure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getAsilValue <em>Asil Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getConstrainedFaultFailure <em>Constrained Fault
+ * Failure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.impl.SafetyConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SafetyConstraintImpl extends TraceableSpecificationImpl implements SafetyConstraint {
+
 	/**
 	 * The default value of the '{@link #getAsilValue() <em>Asil Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAsilValue()
 	 * @generated
 	 * @ordered
@@ -62,6 +65,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getAsilValue() <em>Asil Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAsilValue()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getConstrainedFaultFailure() <em>Constrained Fault Failure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConstrainedFaultFailure()
 	 * @generated
 	 * @ordered
@@ -82,6 +87,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -92,6 +98,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Constraint()
 	 * @generated
 	 * @ordered
@@ -101,6 +108,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SafetyConstraintImpl() {
@@ -110,21 +118,24 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
-				return getAsilValue();
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				return getConstrainedFaultFailure();
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
+		switch(featureID) {
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
+			return getAsilValue();
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			return getConstrainedFaultFailure();
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			if(resolve)
+				return getBase_Constraint();
+			return basicGetBase_Constraint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -132,19 +143,20 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
-				return asilValue != ASIL_VALUE_EDEFAULT;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				return constrainedFaultFailure != null && !constrainedFaultFailure.isEmpty();
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
-				return base_Class != null;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				return base_Constraint != null;
+		switch(featureID) {
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
+			return asilValue != ASIL_VALUE_EDEFAULT;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			return constrainedFaultFailure != null && !constrainedFaultFailure.isEmpty();
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
+			return base_Class != null;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			return base_Constraint != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -152,25 +164,26 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
-				setAsilValue((ASILKind)newValue);
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				getConstrainedFaultFailure().clear();
-				getConstrainedFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
+			setAsilValue((ASILKind)newValue);
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			getConstrainedFaultFailure().clear();
+			getConstrainedFaultFailure().addAll((Collection<? extends FaultFailure>)newValue);
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -178,6 +191,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -188,23 +202,24 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
-				setAsilValue(ASIL_VALUE_EDEFAULT);
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
-				getConstrainedFaultFailure().clear();
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
+		switch(featureID) {
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE:
+			setAsilValue(ASIL_VALUE_EDEFAULT);
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE:
+			getConstrainedFaultFailure().clear();
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,6 +227,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ASILKind getAsilValue() {
@@ -221,22 +237,24 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAsilValue(ASILKind newAsilValue) {
 		ASILKind oldAsilValue = asilValue;
 		asilValue = newAsilValue == null ? ASIL_VALUE_EDEFAULT : newAsilValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.SAFETY_CONSTRAINT__ASIL_VALUE, oldAsilValue, asilValue));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FaultFailure> getConstrainedFaultFailure() {
-		if (constrainedFaultFailure == null) {
+		if(constrainedFaultFailure == null) {
 			constrainedFaultFailure = new EObjectResolvingEList<FaultFailure>(FaultFailure.class, this, SafetyconstraintsPackage.SAFETY_CONSTRAINT__CONSTRAINED_FAULT_FAILURE);
 		}
 		return constrainedFaultFailure;
@@ -245,14 +263,15 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -262,6 +281,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -271,26 +291,28 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
+		if(base_Constraint != null && base_Constraint.eIsProxy()) {
 			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
 			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
+			if(base_Constraint != oldBase_Constraint) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 			}
 		}
@@ -300,6 +322,7 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint basicGetBase_Constraint() {
@@ -309,23 +332,26 @@ public class SafetyConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Constraint(Constraint newBase_Constraint) {
 		Constraint oldBase_Constraint = base_Constraint;
 		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyconstraintsPackage.SAFETY_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (asilValue: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsFactoryImpl.java
index e489b1f47ea..d143003b697 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint;
@@ -33,12 +34,15 @@ import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.Safetyconstra
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements SafetyconstraintsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -51,16 +55,16 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SafetyconstraintsFactory init() {
 		try {
 			SafetyconstraintsFactory theSafetyconstraintsFactory = (SafetyconstraintsFactory)EPackage.Registry.INSTANCE.getEFactory(SafetyconstraintsPackage.eNS_URI);
-			if (theSafetyconstraintsFactory != null) {
+			if(theSafetyconstraintsFactory != null) {
 				return theSafetyconstraintsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new SafetyconstraintsFactoryImpl();
@@ -70,6 +74,7 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyconstraintsFactoryImpl() {
@@ -79,37 +84,43 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case SafetyconstraintsPackage.ASIL_KIND:
-				return convertASILKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case SafetyconstraintsPackage.ASIL_KIND:
+			return convertASILKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SafetyconstraintsPackage.FAULT_FAILURE: return createFaultFailure();
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT: return createSafetyConstraint();
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT: return createQuantitativeSafetyConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case SafetyconstraintsPackage.FAULT_FAILURE:
+			return createFaultFailure();
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT:
+			return createSafetyConstraint();
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT:
+			return createQuantitativeSafetyConstraint();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FaultFailure createFaultFailure() {
@@ -120,21 +131,23 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case SafetyconstraintsPackage.ASIL_KIND:
-				return createASILKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case SafetyconstraintsPackage.ASIL_KIND:
+			return createASILKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public QuantitativeSafetyConstraint createQuantitativeSafetyConstraint() {
@@ -145,17 +158,20 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ASILKind createASILKindFromString(EDataType eDataType, String initialValue) {
 		ASILKind result = ASILKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertASILKindToString(EDataType eDataType, Object instanceValue) {
@@ -165,6 +181,7 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyConstraint createSafetyConstraint() {
@@ -175,6 +192,7 @@ public class SafetyconstraintsFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyconstraintsPackage getSafetyconstraintsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsPackageImpl.java
index 5186fef765f..a01341d179c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/impl/SafetyconstraintsPackageImpl.java
@@ -90,6 +90,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetyconstraintsPackageImpl extends EPackageImpl implements SafetyconstraintsPackage {
@@ -97,6 +98,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass safetyConstraintEClass = null;
@@ -104,6 +106,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass quantitativeSafetyConstraintEClass = null;
@@ -111,6 +114,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass faultFailureEClass = null;
@@ -118,6 +122,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum asilKindEEnum = null;
@@ -125,6 +130,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -132,16 +138,18 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * 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 SafetyconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link SafetyconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static SafetyconstraintsPackage init() {
-		if (isInited) return (SafetyconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(SafetyconstraintsPackage.eNS_URI);
+		if(isInited)
+			return (SafetyconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(SafetyconstraintsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		SafetyconstraintsPackageImpl theSafetyconstraintsPackage = (SafetyconstraintsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SafetyconstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SafetyconstraintsPackageImpl());
@@ -243,7 +251,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 		// Mark meta-data to indicate it can't be changed
 		theSafetyconstraintsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(SafetyconstraintsPackage.eNS_URI, theSafetyconstraintsPackage);
 		return theSafetyconstraintsPackage;
@@ -252,6 +260,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -259,19 +268,19 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage#eNS_URI
 	 * @see #init()
@@ -282,14 +291,16 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -318,6 +329,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFaultFailure() {
@@ -327,6 +339,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailure_Base_Class() {
@@ -336,6 +349,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFaultFailure_Anomaly() {
@@ -345,6 +359,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFaultFailure_FaultFailureValue() {
@@ -354,6 +369,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getQuantitativeSafetyConstraint() {
@@ -363,6 +379,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getQuantitativeSafetyConstraint_ConstrainedFaultFailure() {
@@ -372,6 +389,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getQuantitativeSafetyConstraint_FailureRate() {
@@ -381,6 +399,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getQuantitativeSafetyConstraint_RepairRate() {
@@ -390,6 +409,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getQuantitativeSafetyConstraint_Base_Class() {
@@ -399,6 +419,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getQuantitativeSafetyConstraint_Base_Constraint() {
@@ -408,6 +429,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getASILKind() {
@@ -417,6 +439,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSafetyConstraint() {
@@ -426,6 +449,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSafetyConstraint_AsilValue() {
@@ -435,6 +459,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyConstraint_ConstrainedFaultFailure() {
@@ -444,6 +469,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyConstraint_Base_Class() {
@@ -453,6 +479,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyConstraint_Base_Constraint() {
@@ -462,6 +489,7 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyconstraintsFactory getSafetyconstraintsFactory() {
@@ -469,14 +497,16 @@ public class SafetyconstraintsPackageImpl extends EPackageImpl implements Safety
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsAdapterFactory.java
index 05829153ad6..ad6f69b834e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint;
@@ -33,14 +34,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage
  * @generated
  */
 public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetyconstraintsPackage modelPackage;
@@ -49,48 +53,56 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected SafetyconstraintsSwitch<Adapter> modelSwitch =
-		new SafetyconstraintsSwitch<Adapter>() {
-			@Override
-			public Adapter caseFaultFailure(FaultFailure object) {
-				return createFaultFailureAdapter();
-			}
-			@Override
-			public Adapter caseSafetyConstraint(SafetyConstraint object) {
-				return createSafetyConstraintAdapter();
-			}
-			@Override
-			public Adapter caseQuantitativeSafetyConstraint(QuantitativeSafetyConstraint object) {
-				return createQuantitativeSafetyConstraintAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected SafetyconstraintsSwitch<Adapter> modelSwitch = new SafetyconstraintsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseFaultFailure(FaultFailure object) {
+			return createFaultFailureAdapter();
+		}
+
+		@Override
+		public Adapter caseSafetyConstraint(SafetyConstraint object) {
+			return createSafetyConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseQuantitativeSafetyConstraint(QuantitativeSafetyConstraint object) {
+			return createQuantitativeSafetyConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyconstraintsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetyconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -99,7 +111,9 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -113,6 +127,7 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -121,11 +136,13 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure <em>Fault Failure</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure
+	 * <em>Fault Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure
 	 * @generated
@@ -135,11 +152,13 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint <em>Quantitative Safety Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint
+	 * <em>Quantitative Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint
 	 * @generated
@@ -154,6 +173,7 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -163,11 +183,13 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -177,11 +199,13 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint <em>Safety Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint
+	 * <em>Safety Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint
 	 * @generated
@@ -191,11 +215,13 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -209,15 +235,16 @@ public class SafetyconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceFactoryImpl.java
index f4fd52038e8..c4370401d17 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.util.SafetyconstraintsResourceImpl

  * @generated

  */

 public class SafetyconstraintsResourceFactoryImpl extends ResourceFactoryImpl {

+

 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public SafetyconstraintsResourceFactoryImpl() {

@@ -42,6 +45,7 @@ public class SafetyconstraintsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceImpl.java
index e1d38eaf311..42ee6d96d21 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.util.SafetyconstraintsResourceFactoryImpl

  * @generated

  */

 public class SafetyconstraintsResourceImpl extends XMLResourceImpl {

+

 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public SafetyconstraintsResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsSwitch.java
index e7625a98bbe..2c86367909c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.dependability.safetyconstraints.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.FaultFailure;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.QuantitativeSafetyConstraint;
 import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyConstraint;
@@ -30,21 +31,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.SafetyconstraintsPackage
  * @generated
  */
 public class SafetyconstraintsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetyconstraintsPackage modelPackage;
@@ -53,10 +56,11 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyconstraintsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetyconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -65,6 +69,7 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -80,7 +85,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Fault Failure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -95,7 +102,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Quantitative Safety Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -110,7 +119,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -125,7 +136,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -140,7 +153,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Safety Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -155,7 +170,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -170,7 +187,9 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -184,40 +203,57 @@ public class SafetyconstraintsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SafetyconstraintsPackage.FAULT_FAILURE: {
-				FaultFailure faultFailure = (FaultFailure)theEObject;
-				T result = caseFaultFailure(faultFailure);
-				if (result == null) result = caseTraceableSpecification(faultFailure);
-				if (result == null) result = caseEAPackageableElement(faultFailure);
-				if (result == null) result = caseEAElement(faultFailure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetyconstraintsPackage.SAFETY_CONSTRAINT: {
-				SafetyConstraint safetyConstraint = (SafetyConstraint)theEObject;
-				T result = caseSafetyConstraint(safetyConstraint);
-				if (result == null) result = caseTraceableSpecification(safetyConstraint);
-				if (result == null) result = caseEAPackageableElement(safetyConstraint);
-				if (result == null) result = caseEAElement(safetyConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT: {
-				QuantitativeSafetyConstraint quantitativeSafetyConstraint = (QuantitativeSafetyConstraint)theEObject;
-				T result = caseQuantitativeSafetyConstraint(quantitativeSafetyConstraint);
-				if (result == null) result = caseTraceableSpecification(quantitativeSafetyConstraint);
-				if (result == null) result = caseEAPackageableElement(quantitativeSafetyConstraint);
-				if (result == null) result = caseEAElement(quantitativeSafetyConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case SafetyconstraintsPackage.FAULT_FAILURE:
+		{
+			FaultFailure faultFailure = (FaultFailure)theEObject;
+			T result = caseFaultFailure(faultFailure);
+			if(result == null)
+				result = caseTraceableSpecification(faultFailure);
+			if(result == null)
+				result = caseEAPackageableElement(faultFailure);
+			if(result == null)
+				result = caseEAElement(faultFailure);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetyconstraintsPackage.SAFETY_CONSTRAINT:
+		{
+			SafetyConstraint safetyConstraint = (SafetyConstraint)theEObject;
+			T result = caseSafetyConstraint(safetyConstraint);
+			if(result == null)
+				result = caseTraceableSpecification(safetyConstraint);
+			if(result == null)
+				result = caseEAPackageableElement(safetyConstraint);
+			if(result == null)
+				result = caseEAElement(safetyConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetyconstraintsPackage.QUANTITATIVE_SAFETY_CONSTRAINT:
+		{
+			QuantitativeSafetyConstraint quantitativeSafetyConstraint = (QuantitativeSafetyConstraint)theEObject;
+			T result = caseQuantitativeSafetyConstraint(quantitativeSafetyConstraint);
+			if(result == null)
+				result = caseTraceableSpecification(quantitativeSafetyConstraint);
+			if(result == null)
+				result = caseEAPackageableElement(quantitativeSafetyConstraint);
+			if(result == null)
+				result = caseEAElement(quantitativeSafetyConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsXMLProcessor.java
index e2c4da8ceea..227ae0947db 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyconstraints/util/SafetyconstraintsXMLProcessor.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.eastadl.dependability.safetyconstraints.Safetyconstra
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class SafetyconstraintsXMLProcessor extends XMLProcessor {

@@ -34,22 +35,24 @@ public class SafetyconstraintsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public SafetyconstraintsXMLProcessor() {

 		super((EPackage.Registry.INSTANCE));

 		SafetyconstraintsPackage.eINSTANCE.eClass();

 	}

-	

+

 	/**

 	 * Register for "*" and "xml" file extensions the SafetyconstraintsResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new SafetyconstraintsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new SafetyconstraintsResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/FunctionalSafetyConcept.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/FunctionalSafetyConcept.java
index f44b2ab0b41..3bc63ebc92b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/FunctionalSafetyConcept.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/FunctionalSafetyConcept.java
@@ -24,40 +24,44 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Functional Safety Concept</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * FunctionalSafetyConcept represents the set of functional safety requirements that together fulfils a SafetyGoal in accordance with ISO 26262.
  * 
- * To comply with the SafetyGoals, the FunctionalSafetyConcept specifies the basic safety mechanisms and safety measures in the form of functional safety requirements.
+ * To comply with the SafetyGoals, the FunctionalSafetyConcept specifies the basic safety mechanisms and safety measures in the form of functional
+ * safety requirements.
  * 
  * Constraints:
  * [1] Contained functionalSafetyRequirements shall not be of type SafetyGoal.
  * 
  * Semantics:
- * The collection of requirements in the FunctionalSafetyConcept defines the requirements necessary to make the Item safe. The requirements are abstract and do not specify technical details.
+ * The collection of requirements in the FunctionalSafetyConcept defines the requirements necessary to make the Item safe. The requirements are
+ * abstract and do not specify technical details.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept#getFunctionalSafetyRequirement <em>Functional Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept#getFunctionalSafetyRequirement <em>Functional Safety
+ * Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getFunctionalSafetyConcept()
  * @model
  * @generated
  */
 public interface FunctionalSafetyConcept extends RequirementsContainer {
+
 	/**
 	 * Returns the value of the '<em><b>Functional Safety Requirement</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Functional Safety Requirement</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Functional Safety Requirement</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Functional Safety Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getFunctionalSafetyConcept_FunctionalSafetyRequirement()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyGoal.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyGoal.java
index 7899e04cbd4..90a2e5e2fcf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyGoal.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyGoal.java
@@ -27,16 +27,21 @@ import org.eclipse.papyrus.eastadl.requirements.Requirement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Safety Goal</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * SafetyGoal represents the top-level safety requirement defined in ISO26262. Its purpose is to define how to avoid its associated HazardousEvents, or reduce the risk associated with the hazardous event to an acceptable level.
+ * SafetyGoal represents the top-level safety requirement defined in ISO26262. Its purpose is to define how to avoid its associated HazardousEvents,
+ * or reduce the risk associated with the hazardous event to an acceptable level.
  * The SafetyGoal is defined through one or several associated requirement elements.
  * An ASIL shall be assigned to each SafetyGoal, to represent the integrity level at which the SafetyGoal must be met.
- * Similar SafetyGoals can be combined into one SafetyGoal. If different ASILs are assigned to similar SafetyGoals, the highest ASIL shall be assigned to the combined SafetyGoal. 
- * For every SafetyGoal, a safe state should be defined, either textually or by referencing a specific mode. The safe state is a system state to be maintained or to be reached when a potential source of its hazardous event is detected.
+ * Similar SafetyGoals can be combined into one SafetyGoal. If different ASILs are assigned to similar SafetyGoals, the highest ASIL shall be assigned
+ * to the combined SafetyGoal.
+ * For every SafetyGoal, a safe state should be defined, either textually or by referencing a specific mode. The safe state is a system state to be
+ * maintained or to be reached when a potential source of its hazardous event is detected.
  * 
  * Semantics:
- * SafetyGoal represents a safety Goal according to ISO26262. Requirements define the SafetyGoal and HazardousEvents identify the responsibility of each SafetyGoal. hazardClassification defines the integrity classification of the SafetyGoal and safeStates may be defined by a string or formalized through associated Modes.
+ * SafetyGoal represents a safety Goal according to ISO26262. Requirements define the SafetyGoal and HazardousEvents identify the responsibility of
+ * each SafetyGoal. hazardClassification defines the integrity classification of the SafetyGoal and safeStates may be defined by a string or
+ * formalized through associated Modes.
  * 
  * Notation:
  * SafetyGoal is a box with text SafetyGoal at the top left.
@@ -44,33 +49,34 @@ import org.eclipse.papyrus.eastadl.requirements.Requirement;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getDerivedFrom <em>Derived From</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates <em>Safe States</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getRequirement <em>Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification <em>Hazard Classification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeModes <em>Safe Modes</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getDerivedFrom <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates <em>Safe States</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getRequirement <em>Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification <em>Hazard Classification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeModes <em>Safe Modes</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal()
  * @model
  * @generated
  */
 public interface SafetyGoal extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Derived From</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.dependability.HazardousEvent}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Derived From</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Derived From</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Derived From</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal_DerivedFrom()
 	 * @model required="true" ordered="false"
@@ -83,10 +89,10 @@ public interface SafetyGoal extends EAElement {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hazard Classification</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hazard Classification</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hazard Classification</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #setHazardClassification(ASILKind)
@@ -97,10 +103,13 @@ public interface SafetyGoal extends EAElement {
 	ASILKind getHazardClassification();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification <em>Hazard Classification</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification
+	 * <em>Hazard Classification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hazard Classification</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Hazard Classification</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyconstraints.ASILKind
 	 * @see #getHazardClassification()
 	 * @generated
@@ -112,10 +121,10 @@ public interface SafetyGoal extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Requirement</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Requirement</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal_Requirement()
 	 * @model required="true" ordered="false"
@@ -128,10 +137,10 @@ public interface SafetyGoal extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Safe Modes</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Safe Modes</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Safe Modes</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal_SafeModes()
 	 * @model ordered="false"
@@ -144,8 +153,10 @@ public interface SafetyGoal extends EAElement {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * For every safety goal, a safe state should be defined, in order to declare a system state to be maintained or to be reached when the failure is detected and so to allow a failure mitigation action without any violation of the associated safety goal.
+	 * For every safety goal, a safe state should be defined, in order to declare a system state to be maintained or to be reached when the failure is
+	 * detected and so to allow a failure mitigation action without any violation of the associated safety goal.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Safe States</em>' attribute.
 	 * @see #setSafeStates(String)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal_SafeStates()
@@ -155,10 +166,13 @@ public interface SafetyGoal extends EAElement {
 	String getSafeStates();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates <em>Safe States</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates <em>Safe States</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Safe States</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Safe States</em>' attribute.
 	 * @see #getSafeStates()
 	 * @generated
 	 */
@@ -168,10 +182,10 @@ public interface SafetyGoal extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getSafetyGoal_Base_Class()
@@ -181,10 +195,13 @@ public interface SafetyGoal extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementFactory.java
index f5aed75ad9a..6e82e20c5cf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage
  * @generated
  */
 public interface SafetyrequirementFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetyrequirementFactory eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface SafetyrequirementFactory extends EFactory {
 	 * Returns a new object of class '<em>Functional Safety Concept</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Functional Safety Concept</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface SafetyrequirementFactory extends EFactory {
 	 * Returns a new object of class '<em>Safety Goal</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Safety Goal</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface SafetyrequirementFactory extends EFactory {
 	 * Returns a new object of class '<em>Technical Safety Concept</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Technical Safety Concept</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface SafetyrequirementFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementPackage.java
index d7f42c383f6..f7182e2467f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/SafetyrequirementPackage.java
@@ -28,10 +28,10 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
@@ -40,28 +40,34 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * Overview:
  * This subprofile defines a set of stereotypes concerning the definition of safety requirements linked to the ISO26262 norm.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementFactory
  * @model kind="package"
  * @generated
  */
 public interface SafetyrequirementPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl <em>Functional Safety Concept</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl
+		 * <em>Functional Safety Concept</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getFunctionalSafetyConcept()
 		 * @generated
@@ -72,14 +78,17 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Functional Safety Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT = eINSTANCE.getFunctionalSafetyConcept_FunctionalSafetyRequirement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl <em>Safety Goal</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl
+		 * <em>Safety Goal</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getSafetyGoal()
 		 * @generated
@@ -90,6 +99,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Derived From</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_GOAL__DERIVED_FROM = eINSTANCE.getSafetyGoal_DerivedFrom();
@@ -98,6 +108,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Safe States</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SAFETY_GOAL__SAFE_STATES = eINSTANCE.getSafetyGoal_SafeStates();
@@ -106,6 +117,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_GOAL__BASE_CLASS = eINSTANCE.getSafetyGoal_Base_Class();
@@ -114,6 +126,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_GOAL__REQUIREMENT = eINSTANCE.getSafetyGoal_Requirement();
@@ -122,6 +135,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hazard Classification</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SAFETY_GOAL__HAZARD_CLASSIFICATION = eINSTANCE.getSafetyGoal_HazardClassification();
@@ -130,14 +144,17 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Safe Modes</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SAFETY_GOAL__SAFE_MODES = eINSTANCE.getSafetyGoal_SafeModes();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl <em>Technical Safety Concept</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl
+		 * <em>Technical Safety Concept</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl
 		 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getTechnicalSafetyConcept()
 		 * @generated
@@ -148,6 +165,7 @@ public interface SafetyrequirementPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Technical Safety Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT = eINSTANCE.getTechnicalSafetyConcept_TechnicalSafetyRequirement();
@@ -158,6 +176,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "safetyrequirement";
@@ -166,6 +185,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Dependability/SafetyRequirement/1";
@@ -174,6 +194,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "SafetyRequirement";
@@ -182,14 +203,17 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SafetyrequirementPackage eINSTANCE = org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl <em>Functional Safety Concept</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl
+	 * <em>Functional Safety Concept</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getFunctionalSafetyConcept()
 	 * @generated
@@ -200,6 +224,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -209,6 +234,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -218,6 +244,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -227,6 +254,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -236,6 +264,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -245,6 +274,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Container</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -254,6 +284,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent Container</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -263,6 +294,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -272,6 +304,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -281,6 +314,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Contained Req Spec Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -290,6 +324,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Functional Safety Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -299,15 +334,18 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The number of structural features of the '<em>Functional Safety Concept</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FUNCTIONAL_SAFETY_CONCEPT_FEATURE_COUNT = RequirementsPackage.REQUIREMENTS_CONTAINER_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl <em>Safety Goal</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl <em>Safety Goal</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getSafetyGoal()
 	 * @generated
@@ -318,6 +356,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -327,6 +366,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -336,6 +376,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -345,6 +386,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived From</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -354,6 +396,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Safe States</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -363,6 +406,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -372,6 +416,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -381,6 +426,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Hazard Classification</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -390,6 +436,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Safe Modes</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -399,15 +446,18 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The number of structural features of the '<em>Safety Goal</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SAFETY_GOAL_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl <em>Technical Safety Concept</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl
+	 * <em>Technical Safety Concept</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyrequirementPackageImpl#getTechnicalSafetyConcept()
 	 * @generated
@@ -418,6 +468,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -427,6 +478,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -436,6 +488,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -445,6 +498,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -454,6 +508,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -463,6 +518,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Container</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -472,6 +528,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent Container</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -481,6 +538,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -490,6 +548,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -499,6 +558,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Contained Req Spec Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -508,6 +568,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The feature id for the '<em><b>Technical Safety Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -517,15 +578,18 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * The number of structural features of the '<em>Technical Safety Concept</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TECHNICAL_SAFETY_CONCEPT_FEATURE_COUNT = RequirementsPackage.REQUIREMENTS_CONTAINER_FEATURE_COUNT + 1;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept <em>Functional Safety Concept</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept
+	 * <em>Functional Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Functional Safety Concept</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept
 	 * @generated
@@ -533,9 +597,12 @@ public interface SafetyrequirementPackage extends EPackage {
 	EClass getFunctionalSafetyConcept();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept#getFunctionalSafetyRequirement <em>Functional Safety Requirement</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept#getFunctionalSafetyRequirement
+	 * <em>Functional Safety Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Functional Safety Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept#getFunctionalSafetyRequirement()
 	 * @see #getFunctionalSafetyConcept()
@@ -547,6 +614,7 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal <em>Safety Goal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Safety Goal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal
 	 * @generated
@@ -554,9 +622,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EClass getSafetyGoal();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getDerivedFrom <em>Derived From</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getDerivedFrom
+	 * <em>Derived From</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Derived From</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getDerivedFrom()
 	 * @see #getSafetyGoal()
@@ -565,9 +635,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EReference getSafetyGoal_DerivedFrom();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification <em>Hazard Classification</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification <em>Hazard Classification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Hazard Classification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getHazardClassification()
 	 * @see #getSafetyGoal()
@@ -576,9 +648,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EAttribute getSafetyGoal_HazardClassification();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getRequirement <em>Requirement</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getRequirement
+	 * <em>Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getRequirement()
 	 * @see #getSafetyGoal()
@@ -587,9 +661,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EReference getSafetyGoal_Requirement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeModes <em>Safe Modes</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeModes
+	 * <em>Safe Modes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Safe Modes</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeModes()
 	 * @see #getSafetyGoal()
@@ -598,9 +674,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EReference getSafetyGoal_SafeModes();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates <em>Safe States</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates
+	 * <em>Safe States</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Safe States</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getSafeStates()
 	 * @see #getSafetyGoal()
@@ -609,9 +687,11 @@ public interface SafetyrequirementPackage extends EPackage {
 	EAttribute getSafetyGoal_SafeStates();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal#getBase_Class()
 	 * @see #getSafetyGoal()
@@ -623,15 +703,18 @@ public interface SafetyrequirementPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	SafetyrequirementFactory getSafetyrequirementFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept <em>Technical Safety Concept</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept
+	 * <em>Technical Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Technical Safety Concept</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept
 	 * @generated
@@ -639,9 +722,12 @@ public interface SafetyrequirementPackage extends EPackage {
 	EClass getTechnicalSafetyConcept();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept#getTechnicalSafetyRequirement <em>Technical Safety Requirement</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept#getTechnicalSafetyRequirement
+	 * <em>Technical Safety Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Technical Safety Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept#getTechnicalSafetyRequirement()
 	 * @see #getTechnicalSafetyConcept()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/TechnicalSafetyConcept.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/TechnicalSafetyConcept.java
index 1f31268910b..cf967444fa3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/TechnicalSafetyConcept.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/TechnicalSafetyConcept.java
@@ -24,29 +24,33 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Technical Safety Concept</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * TechnicalSafetyConcept represents the set of technical safety requirements that together fulfils a FunctionalSafetyConcept and SafetyGoal in accordance with ISO 26262.
+ * TechnicalSafetyConcept represents the set of technical safety requirements that together fulfils a FunctionalSafetyConcept and SafetyGoal in
+ * accordance with ISO 26262.
  * 
  * These are derived from FunctionalSafetyConcepts i.e. TechnicalSafetyRequirements are derived from FunctionalSafetyRequirements.
  * 
  * 
  * Semantics:
- * The TechnicalSafetyConcept consists of the technical safety requirements and details the functional safety concept considering the functional concept and the preliminary architectural design. It corresponds to the Technical Safety Concept of ISO26262.
+ * The TechnicalSafetyConcept consists of the technical safety requirements and details the functional safety concept considering the functional
+ * concept and the preliminary architectural design. It corresponds to the Technical Safety Concept of ISO26262.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept#getTechnicalSafetyRequirement <em>Technical Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept#getTechnicalSafetyRequirement <em>Technical Safety
+ * Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getTechnicalSafetyConcept()
  * @model
  * @generated
  */
 public interface TechnicalSafetyConcept extends RequirementsContainer {
+
 	/**
 	 * Returns the value of the '<em><b>Technical Safety Requirement</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
@@ -55,6 +59,7 @@ public interface TechnicalSafetyConcept extends RequirementsContainer {
 	 * <!-- begin-model-doc -->
 	 * technicalSafety Requirements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Technical Safety Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#getTechnicalSafetyConcept_TechnicalSafetyRequirement()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/FunctionalSafetyConceptImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/FunctionalSafetyConceptImpl.java
index 724fb0ed98d..b30c61dfa7b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/FunctionalSafetyConceptImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/FunctionalSafetyConceptImpl.java
@@ -33,25 +33,30 @@ import org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl#getFunctionalSafetyRequirement <em>Functional Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.FunctionalSafetyConceptImpl#getFunctionalSafetyRequirement <em>
+ * Functional Safety Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl implements FunctionalSafetyConcept {
+
 	/**
 	 * The cached value of the '{@link #getFunctionalSafetyRequirement() <em>Functional Safety Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionalSafetyRequirement()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList<Requirement> functionalSafetyRequirement;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionalSafetyConceptImpl() {
@@ -61,13 +66,14 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
-				return getFunctionalSafetyRequirement();
+		switch(featureID) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
+			return getFunctionalSafetyRequirement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -75,13 +81,14 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
-				return functionalSafetyRequirement != null && !functionalSafetyRequirement.isEmpty();
+		switch(featureID) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
+			return functionalSafetyRequirement != null && !functionalSafetyRequirement.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -89,16 +96,17 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
-				getFunctionalSafetyRequirement().clear();
-				getFunctionalSafetyRequirement().addAll((Collection<? extends Requirement>)newValue);
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
+			getFunctionalSafetyRequirement().clear();
+			getFunctionalSafetyRequirement().addAll((Collection<? extends Requirement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -106,6 +114,7 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,14 +125,15 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
-				getFunctionalSafetyRequirement().clear();
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT:
+			getFunctionalSafetyRequirement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -131,10 +141,11 @@ public class FunctionalSafetyConceptImpl extends RequirementsContainerImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getFunctionalSafetyRequirement() {
-		if (functionalSafetyRequirement == null) {
+		if(functionalSafetyRequirement == null) {
 			functionalSafetyRequirement = new EObjectResolvingEList<Requirement>(Requirement.class, this, SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT__FUNCTIONAL_SAFETY_REQUIREMENT);
 		}
 		return functionalSafetyRequirement;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyGoalImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyGoalImpl.java
index 469ef20bd1d..6692f074b57 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyGoalImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyGoalImpl.java
@@ -39,22 +39,24 @@ import org.eclipse.papyrus.eastadl.requirements.Requirement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getDerivedFrom <em>Derived From</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getSafeStates <em>Safe States</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getRequirement <em>Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getHazardClassification <em>Hazard Classification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getSafeModes <em>Safe Modes</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getDerivedFrom <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getSafeStates <em>Safe States</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getRequirement <em>Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getHazardClassification <em>Hazard Classification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.SafetyGoalImpl#getSafeModes <em>Safe Modes</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
+
 	/**
 	 * The cached value of the '{@link #getDerivedFrom() <em>Derived From</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDerivedFrom()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The default value of the '{@link #getSafeStates() <em>Safe States</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafeStates()
 	 * @generated
 	 * @ordered
@@ -75,6 +78,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The cached value of the '{@link #getSafeStates() <em>Safe States</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafeStates()
 	 * @generated
 	 * @ordered
@@ -85,6 +89,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -95,6 +100,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The cached value of the '{@link #getRequirement() <em>Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRequirement()
 	 * @generated
 	 * @ordered
@@ -105,6 +111,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The default value of the '{@link #getHazardClassification() <em>Hazard Classification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazardClassification()
 	 * @generated
 	 * @ordered
@@ -115,6 +122,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The cached value of the '{@link #getHazardClassification() <em>Hazard Classification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHazardClassification()
 	 * @generated
 	 * @ordered
@@ -125,6 +133,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	 * The cached value of the '{@link #getSafeModes() <em>Safe Modes</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSafeModes()
 	 * @generated
 	 * @ordered
@@ -134,6 +143,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SafetyGoalImpl() {
@@ -143,24 +153,26 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
-				return getDerivedFrom();
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
-				return getSafeStates();
-			case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
-				return getRequirement();
-			case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
-				return getHazardClassification();
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
-				return getSafeModes();
+		switch(featureID) {
+		case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
+			return getDerivedFrom();
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
+			return getSafeStates();
+		case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
+			return getRequirement();
+		case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
+			return getHazardClassification();
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
+			return getSafeModes();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -168,23 +180,24 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
-				return derivedFrom != null && !derivedFrom.isEmpty();
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
-				return SAFE_STATES_EDEFAULT == null ? safeStates != null : !SAFE_STATES_EDEFAULT.equals(safeStates);
-			case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
-				return base_Class != null;
-			case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
-				return requirement != null && !requirement.isEmpty();
-			case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
-				return hazardClassification != HAZARD_CLASSIFICATION_EDEFAULT;
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
-				return safeModes != null && !safeModes.isEmpty();
+		switch(featureID) {
+		case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
+			return derivedFrom != null && !derivedFrom.isEmpty();
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
+			return SAFE_STATES_EDEFAULT == null ? safeStates != null : !SAFE_STATES_EDEFAULT.equals(safeStates);
+		case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
+			return base_Class != null;
+		case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
+			return requirement != null && !requirement.isEmpty();
+		case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
+			return hazardClassification != HAZARD_CLASSIFICATION_EDEFAULT;
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
+			return safeModes != null && !safeModes.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -192,33 +205,34 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
-				getDerivedFrom().clear();
-				getDerivedFrom().addAll((Collection<? extends HazardousEvent>)newValue);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
-				setSafeStates((String)newValue);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
-				getRequirement().clear();
-				getRequirement().addAll((Collection<? extends Requirement>)newValue);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
-				setHazardClassification((ASILKind)newValue);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
-				getSafeModes().clear();
-				getSafeModes().addAll((Collection<? extends Mode>)newValue);
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
+			getDerivedFrom().clear();
+			getDerivedFrom().addAll((Collection<? extends HazardousEvent>)newValue);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
+			setSafeStates((String)newValue);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
+			getRequirement().clear();
+			getRequirement().addAll((Collection<? extends Requirement>)newValue);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
+			setHazardClassification((ASILKind)newValue);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
+			getSafeModes().clear();
+			getSafeModes().addAll((Collection<? extends Mode>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -226,6 +240,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -236,29 +251,30 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
-				getDerivedFrom().clear();
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
-				setSafeStates(SAFE_STATES_EDEFAULT);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
-				getRequirement().clear();
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
-				setHazardClassification(HAZARD_CLASSIFICATION_EDEFAULT);
-				return;
-			case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
-				getSafeModes().clear();
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM:
+			getDerivedFrom().clear();
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES:
+			setSafeStates(SAFE_STATES_EDEFAULT);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT:
+			getRequirement().clear();
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION:
+			setHazardClassification(HAZARD_CLASSIFICATION_EDEFAULT);
+			return;
+		case SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES:
+			getSafeModes().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -266,10 +282,11 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HazardousEvent> getDerivedFrom() {
-		if (derivedFrom == null) {
+		if(derivedFrom == null) {
 			derivedFrom = new EObjectResolvingEList<HazardousEvent>(HazardousEvent.class, this, SafetyrequirementPackage.SAFETY_GOAL__DERIVED_FROM);
 		}
 		return derivedFrom;
@@ -278,6 +295,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ASILKind getHazardClassification() {
@@ -287,22 +305,24 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHazardClassification(ASILKind newHazardClassification) {
 		ASILKind oldHazardClassification = hazardClassification;
 		hazardClassification = newHazardClassification == null ? HAZARD_CLASSIFICATION_EDEFAULT : newHazardClassification;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyrequirementPackage.SAFETY_GOAL__HAZARD_CLASSIFICATION, oldHazardClassification, hazardClassification));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getRequirement() {
-		if (requirement == null) {
+		if(requirement == null) {
 			requirement = new EObjectResolvingEList<Requirement>(Requirement.class, this, SafetyrequirementPackage.SAFETY_GOAL__REQUIREMENT);
 		}
 		return requirement;
@@ -311,10 +331,11 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getSafeModes() {
-		if (safeModes == null) {
+		if(safeModes == null) {
 			safeModes = new EObjectResolvingEList<Mode>(Mode.class, this, SafetyrequirementPackage.SAFETY_GOAL__SAFE_MODES);
 		}
 		return safeModes;
@@ -323,6 +344,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSafeStates() {
@@ -332,26 +354,28 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSafeStates(String newSafeStates) {
 		String oldSafeStates = safeStates;
 		safeStates = newSafeStates;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyrequirementPackage.SAFETY_GOAL__SAFE_STATES, oldSafeStates, safeStates));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -361,6 +385,7 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -370,23 +395,26 @@ public class SafetyGoalImpl extends EAElementImpl implements SafetyGoal {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SafetyrequirementPackage.SAFETY_GOAL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (safeStates: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementFactoryImpl.java
index b0027605a6e..0f843b029b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementFactory;
@@ -31,12 +32,15 @@ import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafe
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetyrequirementFactoryImpl extends EFactoryImpl implements SafetyrequirementFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -49,16 +53,16 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SafetyrequirementFactory init() {
 		try {
 			SafetyrequirementFactory theSafetyrequirementFactory = (SafetyrequirementFactory)EPackage.Registry.INSTANCE.getEFactory(SafetyrequirementPackage.eNS_URI);
-			if (theSafetyrequirementFactory != null) {
+			if(theSafetyrequirementFactory != null) {
 				return theSafetyrequirementFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new SafetyrequirementFactoryImpl();
@@ -68,6 +72,7 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementFactoryImpl() {
@@ -77,22 +82,27 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT: return createFunctionalSafetyConcept();
-			case SafetyrequirementPackage.SAFETY_GOAL: return createSafetyGoal();
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT: return createTechnicalSafetyConcept();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT:
+			return createFunctionalSafetyConcept();
+		case SafetyrequirementPackage.SAFETY_GOAL:
+			return createSafetyGoal();
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT:
+			return createTechnicalSafetyConcept();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionalSafetyConcept createFunctionalSafetyConcept() {
@@ -103,6 +113,7 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyGoal createSafetyGoal() {
@@ -113,6 +124,7 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TechnicalSafetyConcept createTechnicalSafetyConcept() {
@@ -123,6 +135,7 @@ public class SafetyrequirementFactoryImpl extends EFactoryImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementPackage getSafetyrequirementPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementPackageImpl.java
index 3ba24c3c4f0..72e4cafd0f4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/SafetyrequirementPackageImpl.java
@@ -88,6 +88,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetyrequirementPackageImpl extends EPackageImpl implements SafetyrequirementPackage {
@@ -95,16 +96,18 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * 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 SafetyrequirementPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link SafetyrequirementPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static SafetyrequirementPackage init() {
-		if (isInited) return (SafetyrequirementPackage)EPackage.Registry.INSTANCE.getEPackage(SafetyrequirementPackage.eNS_URI);
+		if(isInited)
+			return (SafetyrequirementPackage)EPackage.Registry.INSTANCE.getEPackage(SafetyrequirementPackage.eNS_URI);
 
 		// Obtain or create and register package
 		SafetyrequirementPackageImpl theSafetyrequirementPackage = (SafetyrequirementPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SafetyrequirementPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SafetyrequirementPackageImpl());
@@ -206,7 +209,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 		// Mark meta-data to indicate it can't be changed
 		theSafetyrequirementPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(SafetyrequirementPackage.eNS_URI, theSafetyrequirementPackage);
 		return theSafetyrequirementPackage;
@@ -215,6 +218,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass functionalSafetyConceptEClass = null;
@@ -222,6 +226,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass safetyGoalEClass = null;
@@ -229,6 +234,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass technicalSafetyConceptEClass = null;
@@ -236,6 +242,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -243,6 +250,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -250,19 +258,19 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage#eNS_URI
 	 * @see #init()
@@ -273,14 +281,16 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -302,6 +312,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFunctionalSafetyConcept() {
@@ -311,6 +322,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFunctionalSafetyConcept_FunctionalSafetyRequirement() {
@@ -320,6 +332,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSafetyGoal() {
@@ -329,6 +342,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyGoal_DerivedFrom() {
@@ -338,6 +352,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSafetyGoal_HazardClassification() {
@@ -347,6 +362,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyGoal_Requirement() {
@@ -356,6 +372,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyGoal_SafeModes() {
@@ -365,6 +382,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSafetyGoal_SafeStates() {
@@ -374,6 +392,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSafetyGoal_Base_Class() {
@@ -383,6 +402,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementFactory getSafetyrequirementFactory() {
@@ -392,6 +412,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTechnicalSafetyConcept() {
@@ -401,6 +422,7 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTechnicalSafetyConcept_TechnicalSafetyRequirement() {
@@ -408,14 +430,16 @@ public class SafetyrequirementPackageImpl extends EPackageImpl implements Safety
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/TechnicalSafetyConceptImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/TechnicalSafetyConceptImpl.java
index ec1bed9ae10..4830a3dd935 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/TechnicalSafetyConceptImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/impl/TechnicalSafetyConceptImpl.java
@@ -33,17 +33,20 @@ import org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl#getTechnicalSafetyRequirement <em>Technical Safety Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.impl.TechnicalSafetyConceptImpl#getTechnicalSafetyRequirement <em>Technical
+ * Safety Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implements TechnicalSafetyConcept {
+
 	/**
 	 * The cached value of the '{@link #getTechnicalSafetyRequirement() <em>Technical Safety Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTechnicalSafetyRequirement()
 	 * @generated
 	 * @ordered
@@ -53,6 +56,7 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TechnicalSafetyConceptImpl() {
@@ -62,13 +66,14 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
-				return getTechnicalSafetyRequirement();
+		switch(featureID) {
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
+			return getTechnicalSafetyRequirement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -76,13 +81,14 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
-				return technicalSafetyRequirement != null && !technicalSafetyRequirement.isEmpty();
+		switch(featureID) {
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
+			return technicalSafetyRequirement != null && !technicalSafetyRequirement.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -90,16 +96,17 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
-				getTechnicalSafetyRequirement().clear();
-				getTechnicalSafetyRequirement().addAll((Collection<? extends Requirement>)newValue);
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
+			getTechnicalSafetyRequirement().clear();
+			getTechnicalSafetyRequirement().addAll((Collection<? extends Requirement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -107,6 +114,7 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -117,14 +125,15 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
-				getTechnicalSafetyRequirement().clear();
-				return;
+		switch(featureID) {
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT:
+			getTechnicalSafetyRequirement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -132,10 +141,11 @@ public class TechnicalSafetyConceptImpl extends RequirementsContainerImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getTechnicalSafetyRequirement() {
-		if (technicalSafetyRequirement == null) {
+		if(technicalSafetyRequirement == null) {
 			technicalSafetyRequirement = new EObjectResolvingEList<Requirement>(Requirement.class, this, SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT__TECHNICAL_SAFETY_REQUIREMENT);
 		}
 		return technicalSafetyRequirement;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementAdapterFactory.java
index 4e6ecc3dbf7..fb400badc43 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage;
@@ -34,14 +35,17 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage
  * @generated
  */
 public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetyrequirementPackage modelPackage;
@@ -50,52 +54,61 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected SafetyrequirementSwitch<Adapter> modelSwitch =
-		new SafetyrequirementSwitch<Adapter>() {
-			@Override
-			public Adapter caseFunctionalSafetyConcept(FunctionalSafetyConcept object) {
-				return createFunctionalSafetyConceptAdapter();
-			}
-			@Override
-			public Adapter caseSafetyGoal(SafetyGoal object) {
-				return createSafetyGoalAdapter();
-			}
-			@Override
-			public Adapter caseTechnicalSafetyConcept(TechnicalSafetyConcept object) {
-				return createTechnicalSafetyConceptAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseRequirementsContainer(RequirementsContainer object) {
-				return createRequirementsContainerAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected SafetyrequirementSwitch<Adapter> modelSwitch = new SafetyrequirementSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseFunctionalSafetyConcept(FunctionalSafetyConcept object) {
+			return createFunctionalSafetyConceptAdapter();
+		}
+
+		@Override
+		public Adapter caseSafetyGoal(SafetyGoal object) {
+			return createSafetyGoalAdapter();
+		}
+
+		@Override
+		public Adapter caseTechnicalSafetyConcept(TechnicalSafetyConcept object) {
+			return createTechnicalSafetyConceptAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseRequirementsContainer(RequirementsContainer object) {
+			return createRequirementsContainerAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetyrequirementPackage.eINSTANCE;
 		}
 	}
@@ -104,7 +117,9 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -118,6 +133,7 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -126,11 +142,13 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept <em>Functional Safety Concept</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept
+	 * <em>Functional Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept
 	 * @generated
@@ -145,6 +163,7 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer
 	 * @generated
@@ -154,11 +173,13 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal <em>Safety Goal</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal
+	 * <em>Safety Goal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal
 	 * @generated
@@ -168,11 +189,13 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept <em>Technical Safety Concept</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept
+	 * <em>Technical Safety Concept</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.TechnicalSafetyConcept
 	 * @generated
@@ -187,6 +210,7 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -196,11 +220,13 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -210,11 +236,13 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -228,15 +256,16 @@ public class SafetyrequirementAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceFactoryImpl.java
index 9187a0edce3..6686e188d9c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.util.SafetyrequirementResourceImpl
  * @generated
  */
 public class SafetyrequirementResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class SafetyrequirementResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceImpl.java
index 05cd9edebf1..6096cc3bf9f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.util.SafetyrequirementResourceFactoryImpl
  * @generated
  */
 public class SafetyrequirementResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public SafetyrequirementResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementSwitch.java
index f0bca87b728..ef55d9c475d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.dependability.safetyrequirement.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.*;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.FunctionalSafetyConcept;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyGoal;
 import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage;
@@ -31,21 +32,23 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.safetyrequirement.SafetyrequirementPackage
  * @generated
  */
 public class SafetyrequirementSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SafetyrequirementPackage modelPackage;
@@ -54,10 +57,11 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SafetyrequirementPackage.eINSTANCE;
 		}
 	}
@@ -66,6 +70,7 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -81,7 +86,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Functional Safety Concept</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -96,7 +103,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Container</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -111,7 +120,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Safety Goal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -126,7 +137,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Technical Safety Concept</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -141,7 +154,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -156,7 +171,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -171,7 +188,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -186,7 +205,9 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -200,40 +221,57 @@ public class SafetyrequirementSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT: {
-				FunctionalSafetyConcept functionalSafetyConcept = (FunctionalSafetyConcept)theEObject;
-				T result = caseFunctionalSafetyConcept(functionalSafetyConcept);
-				if (result == null) result = caseRequirementsContainer(functionalSafetyConcept);
-				if (result == null) result = caseTraceableSpecification(functionalSafetyConcept);
-				if (result == null) result = caseEAPackageableElement(functionalSafetyConcept);
-				if (result == null) result = caseEAElement(functionalSafetyConcept);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetyrequirementPackage.SAFETY_GOAL: {
-				SafetyGoal safetyGoal = (SafetyGoal)theEObject;
-				T result = caseSafetyGoal(safetyGoal);
-				if (result == null) result = caseEAElement(safetyGoal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT: {
-				TechnicalSafetyConcept technicalSafetyConcept = (TechnicalSafetyConcept)theEObject;
-				T result = caseTechnicalSafetyConcept(technicalSafetyConcept);
-				if (result == null) result = caseRequirementsContainer(technicalSafetyConcept);
-				if (result == null) result = caseTraceableSpecification(technicalSafetyConcept);
-				if (result == null) result = caseEAPackageableElement(technicalSafetyConcept);
-				if (result == null) result = caseEAElement(technicalSafetyConcept);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case SafetyrequirementPackage.FUNCTIONAL_SAFETY_CONCEPT:
+		{
+			FunctionalSafetyConcept functionalSafetyConcept = (FunctionalSafetyConcept)theEObject;
+			T result = caseFunctionalSafetyConcept(functionalSafetyConcept);
+			if(result == null)
+				result = caseRequirementsContainer(functionalSafetyConcept);
+			if(result == null)
+				result = caseTraceableSpecification(functionalSafetyConcept);
+			if(result == null)
+				result = caseEAPackageableElement(functionalSafetyConcept);
+			if(result == null)
+				result = caseEAElement(functionalSafetyConcept);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetyrequirementPackage.SAFETY_GOAL:
+		{
+			SafetyGoal safetyGoal = (SafetyGoal)theEObject;
+			T result = caseSafetyGoal(safetyGoal);
+			if(result == null)
+				result = caseEAElement(safetyGoal);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SafetyrequirementPackage.TECHNICAL_SAFETY_CONCEPT:
+		{
+			TechnicalSafetyConcept technicalSafetyConcept = (TechnicalSafetyConcept)theEObject;
+			T result = caseTechnicalSafetyConcept(technicalSafetyConcept);
+			if(result == null)
+				result = caseRequirementsContainer(technicalSafetyConcept);
+			if(result == null)
+				result = caseTraceableSpecification(technicalSafetyConcept);
+			if(result == null)
+				result = caseEAPackageableElement(technicalSafetyConcept);
+			if(result == null)
+				result = caseEAElement(technicalSafetyConcept);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementXMLProcessor.java
index 535e83243dc..44ba3637c4e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/safetyrequirement/util/SafetyrequirementXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.dependability.safetyrequirement.Safetyrequire
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SafetyrequirementXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class SafetyrequirementXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SafetyrequirementXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		SafetyrequirementPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the SafetyrequirementResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new SafetyrequirementResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new SafetyrequirementResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityAdapterFactory.java
index 241648349c1..9dd28ddd7dc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.dependability.*;
 import org.eclipse.papyrus.eastadl.dependability.Dependability;
 import org.eclipse.papyrus.eastadl.dependability.DependabilityPackage;
 import org.eclipse.papyrus.eastadl.dependability.FeatureFlaw;
@@ -36,14 +37,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage
  * @generated
  */
 public class DependabilityAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DependabilityPackage modelPackage;
@@ -52,60 +56,71 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected DependabilitySwitch<Adapter> modelSwitch =
-		new DependabilitySwitch<Adapter>() {
-			@Override
-			public Adapter caseHazardousEvent(HazardousEvent object) {
-				return createHazardousEventAdapter();
-			}
-			@Override
-			public Adapter caseHazard(Hazard object) {
-				return createHazardAdapter();
-			}
-			@Override
-			public Adapter caseFeatureFlaw(FeatureFlaw object) {
-				return createFeatureFlawAdapter();
-			}
-			@Override
-			public Adapter caseItem(Item object) {
-				return createItemAdapter();
-			}
-			@Override
-			public Adapter caseDependability(Dependability object) {
-				return createDependabilityAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected DependabilitySwitch<Adapter> modelSwitch = new DependabilitySwitch<Adapter>() {
+
+		@Override
+		public Adapter caseHazardousEvent(HazardousEvent object) {
+			return createHazardousEventAdapter();
+		}
+
+		@Override
+		public Adapter caseHazard(Hazard object) {
+			return createHazardAdapter();
+		}
+
+		@Override
+		public Adapter caseFeatureFlaw(FeatureFlaw object) {
+			return createFeatureFlawAdapter();
+		}
+
+		@Override
+		public Adapter caseItem(Item object) {
+			return createItemAdapter();
+		}
+
+		@Override
+		public Adapter caseDependability(Dependability object) {
+			return createDependabilityAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DependabilityAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DependabilityPackage.eINSTANCE;
 		}
 	}
@@ -114,7 +129,9 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -129,6 +146,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -143,6 +161,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Dependability
 	 * @generated
@@ -157,6 +176,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -166,11 +186,13 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -184,6 +206,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -197,6 +220,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.FeatureFlaw
 	 * @generated
@@ -211,6 +235,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Hazard
 	 * @generated
@@ -225,6 +250,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.HazardousEvent
 	 * @generated
@@ -239,6 +265,7 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.dependability.Item
 	 * @generated
@@ -248,11 +275,13 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -266,15 +295,16 @@ public class DependabilityAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceFactoryImpl.java
index 8ad0d47355f..b68ee555b3d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.dependability.util.DependabilityResourceImpl

  * @generated

  */

 public class DependabilityResourceFactoryImpl extends ResourceFactoryImpl {

+

 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DependabilityResourceFactoryImpl() {

@@ -42,6 +45,7 @@ public class DependabilityResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceImpl.java
index 5fcd30679be..da5ab82133e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.dependability.util.DependabilityResourceFactoryImpl

  * @generated

  */

 public class DependabilityResourceImpl extends XMLResourceImpl {

+

 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public DependabilityResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilitySwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilitySwitch.java
index fe7aa01316d..d2d68a334a7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilitySwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilitySwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.dependability.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.dependability.*;
 import org.eclipse.papyrus.eastadl.dependability.Dependability;
 import org.eclipse.papyrus.eastadl.dependability.DependabilityPackage;
 import org.eclipse.papyrus.eastadl.dependability.FeatureFlaw;
@@ -33,21 +34,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.dependability.DependabilityPackage
  * @generated
  */
 public class DependabilitySwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DependabilityPackage modelPackage;
@@ -56,10 +59,11 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DependabilitySwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DependabilityPackage.eINSTANCE;
 		}
 	}
@@ -68,6 +72,7 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -83,7 +88,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -98,7 +105,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dependability</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -113,7 +122,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -128,7 +139,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -143,7 +156,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Feature Flaw</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -158,7 +173,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hazard</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -173,7 +190,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hazardous Event</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -188,7 +207,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -203,7 +224,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -218,7 +241,9 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -232,55 +257,79 @@ public class DependabilitySwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case DependabilityPackage.HAZARDOUS_EVENT: {
-				HazardousEvent hazardousEvent = (HazardousEvent)theEObject;
-				T result = caseHazardousEvent(hazardousEvent);
-				if (result == null) result = caseTraceableSpecification(hazardousEvent);
-				if (result == null) result = caseEAPackageableElement(hazardousEvent);
-				if (result == null) result = caseEAElement(hazardousEvent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DependabilityPackage.HAZARD: {
-				Hazard hazard = (Hazard)theEObject;
-				T result = caseHazard(hazard);
-				if (result == null) result = caseTraceableSpecification(hazard);
-				if (result == null) result = caseEAPackageableElement(hazard);
-				if (result == null) result = caseEAElement(hazard);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DependabilityPackage.FEATURE_FLAW: {
-				FeatureFlaw featureFlaw = (FeatureFlaw)theEObject;
-				T result = caseFeatureFlaw(featureFlaw);
-				if (result == null) result = caseTraceableSpecification(featureFlaw);
-				if (result == null) result = caseEAPackageableElement(featureFlaw);
-				if (result == null) result = caseEAElement(featureFlaw);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DependabilityPackage.ITEM: {
-				Item item = (Item)theEObject;
-				T result = caseItem(item);
-				if (result == null) result = caseEAElement(item);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DependabilityPackage.DEPENDABILITY: {
-				Dependability dependability = (Dependability)theEObject;
-				T result = caseDependability(dependability);
-				if (result == null) result = caseContext(dependability);
-				if (result == null) result = caseEAElement(dependability);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case DependabilityPackage.HAZARDOUS_EVENT:
+		{
+			HazardousEvent hazardousEvent = (HazardousEvent)theEObject;
+			T result = caseHazardousEvent(hazardousEvent);
+			if(result == null)
+				result = caseTraceableSpecification(hazardousEvent);
+			if(result == null)
+				result = caseEAPackageableElement(hazardousEvent);
+			if(result == null)
+				result = caseEAElement(hazardousEvent);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DependabilityPackage.HAZARD:
+		{
+			Hazard hazard = (Hazard)theEObject;
+			T result = caseHazard(hazard);
+			if(result == null)
+				result = caseTraceableSpecification(hazard);
+			if(result == null)
+				result = caseEAPackageableElement(hazard);
+			if(result == null)
+				result = caseEAElement(hazard);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DependabilityPackage.FEATURE_FLAW:
+		{
+			FeatureFlaw featureFlaw = (FeatureFlaw)theEObject;
+			T result = caseFeatureFlaw(featureFlaw);
+			if(result == null)
+				result = caseTraceableSpecification(featureFlaw);
+			if(result == null)
+				result = caseEAPackageableElement(featureFlaw);
+			if(result == null)
+				result = caseEAElement(featureFlaw);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DependabilityPackage.ITEM:
+		{
+			Item item = (Item)theEObject;
+			T result = caseItem(item);
+			if(result == null)
+				result = caseEAElement(item);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DependabilityPackage.DEPENDABILITY:
+		{
+			Dependability dependability = (Dependability)theEObject;
+			T result = caseDependability(dependability);
+			if(result == null)
+				result = caseContext(dependability);
+			if(result == null)
+				result = caseEAElement(dependability);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityXMLProcessor.java
index 96da14296e6..58bd2b4a297 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dependability/util/DependabilityXMLProcessor.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.eastadl.dependability.DependabilityPackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class DependabilityXMLProcessor extends XMLProcessor {

@@ -34,22 +35,24 @@ public class DependabilityXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DependabilityXMLProcessor() {

 		super((EPackage.Registry.INSTANCE));

 		DependabilityPackage.eINSTANCE.eClass();

 	}

-	

+

 	/**

 	 * Register for "*" and "xml" file extensions the DependabilityResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new DependabilityResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new DependabilityResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dummy.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dummy.java
index 18a5591623d..ca3905d84b4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dummy.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/dummy.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>dummy</b></em>',

  * and utility methods for working with them.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.EastadlPackage#getdummy()

  * @model

  * @generated

@@ -37,16 +38,16 @@ public enum dummy implements Enumerator {
 	 * An array of all the '<em><b>dummy</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	private static final dummy[] VALUES_ARRAY =

-		new dummy[] {

-		};

+	private static final dummy[] VALUES_ARRAY = new dummy[]{};

 

 	/**

 	 * A public read-only list of all the '<em><b>dummy</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static final List<dummy> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -55,12 +56,13 @@ public enum dummy implements Enumerator {
 	 * Returns the '<em><b>dummy</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static dummy get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			dummy result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

+			if(result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -71,12 +73,13 @@ public enum dummy implements Enumerator {
 	 * Returns the '<em><b>dummy</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static dummy getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			dummy result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

+			if(result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -87,10 +90,11 @@ public enum dummy implements Enumerator {
 	 * Returns the '<em><b>dummy</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static dummy get(int value) {

-		switch (value) {

+		switch(value) {

 		}

 		return null;

 	}

@@ -98,6 +102,7 @@ public enum dummy implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final int value;

@@ -105,6 +110,7 @@ public enum dummy implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String name;

@@ -112,6 +118,7 @@ public enum dummy implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String literal;

@@ -120,6 +127,7 @@ public enum dummy implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private dummy(int value, String name, String literal) {

@@ -131,39 +139,43 @@ public enum dummy implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public int getValue() {

-	  return value;

+		return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getName() {

-	  return name;

+		return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getLiteral() {

-	  return literal;

+		return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

 		return literal;

 	}

-	

+

 } //dummy

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/ClampConnector.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/ClampConnector.java
index 7e7ef3fc1bb..b3aab82043d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/ClampConnector.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/ClampConnector.java
@@ -26,9 +26,13 @@ import org.eclipse.uml2.uml.Connector;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Clamp Connector</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The clamp connector connects ports across function boundaries and containment hierarchies. It is used to connect from an EnvironmentModel to the FunctionalAnalysisArchitecture, the FunctionalDesignArchitecture, the autosarSystem or another EnvironmentModel. Typically, the EnvironmentModel contains physical ports, which restrict the valid ports in the FunctionalAnalysisArchitecture to those on FunctionalDevices and in the FunctionalDesignArchitecture to those on HardwareFunctions. In case the connection concerns logical interaction, this restriction does not apply. The ClampConnector is always an assembly connector, never a delegation connector.
+ * The clamp connector connects ports across function boundaries and containment hierarchies. It is used to connect from an EnvironmentModel to the
+ * FunctionalAnalysisArchitecture, the FunctionalDesignArchitecture, the autosarSystem or another EnvironmentModel. Typically, the EnvironmentModel
+ * contains physical ports, which restrict the valid ports in the FunctionalAnalysisArchitecture to those on FunctionalDevices and in the
+ * FunctionalDesignArchitecture to those on HardwareFunctions. In case the connection concerns logical interaction, this restriction does not apply.
+ * The ClampConnector is always an assembly connector, never a delegation connector.
  * 
  * Constraints:
  * [1] Can connect two FunctionFlowPorts of different direction.
@@ -36,31 +40,32 @@ import org.eclipse.uml2.uml.Connector;
  * [3] Can connect two FunctionFlowPorts with direction inout.
  * [4] Cannot connect ports in the same SystemModel.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getClampConnector()
  * @model
  * @generated
  */
 public interface ClampConnector extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Port</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getClampConnector_Port()
 	 * @model lower="2" upper="2" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -72,10 +77,10 @@ public interface ClampConnector extends EAElement {
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Connector</em>' reference.
 	 * @see #setBase_Connector(Connector)
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getClampConnector_Base_Connector()
@@ -88,7 +93,9 @@ public interface ClampConnector extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Connector</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Connector</em>' reference.
 	 * @see #getBase_Connector()
 	 * @generated
 	 */
@@ -99,10 +106,10 @@ public interface ClampConnector extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port1 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getClampConnector_Port1_path()
 	 * @model
@@ -115,10 +122,10 @@ public interface ClampConnector extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port2 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getClampConnector_Port2_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/Environment.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/Environment.java
index 3ecf70f32c8..4e699719ce4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/Environment.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/Environment.java
@@ -24,39 +24,42 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Environment</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The collection of the environment functional description. This collection can be done across the EAST-ADL2 abstraction levels.
  * 
- * An environment model can contain functionPrototypes given by either AnalysisFunction or DesignFunction. The environment model does not have abstraction levels as in the system model (e.g., analysisLevel, designLevel).
+ * An environment model can contain functionPrototypes given by either AnalysisFunction or DesignFunction. The environment model does not have
+ * abstraction levels as in the system model (e.g., analysisLevel, designLevel).
  * 
- * A functionPrototype of the environment model can have interactions with FAA FunctionalDevice and an FDA HardwareFunction through the ClampConnector.
+ * A functionPrototype of the environment model can have interactions with FAA FunctionalDevice and an FDA HardwareFunction through the
+ * ClampConnector.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel <em>Environment Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getClampConnector <em>Clamp Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel <em>Environment Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getClampConnector <em>Clamp Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getEnvironment()
  * @model
  * @generated
  */
 public interface Environment extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Clamp Connector</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.environment.ClampConnector}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Clamp Connector</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Clamp Connector</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Clamp Connector</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getEnvironment_ClampConnector()
 	 * @model ordered="false"
@@ -68,10 +71,10 @@ public interface Environment extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getEnvironment_Base_Class()
@@ -84,7 +87,9 @@ public interface Environment extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -94,10 +99,10 @@ public interface Environment extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getEnvironment_Base_Package()
@@ -110,7 +115,9 @@ public interface Environment extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -120,10 +127,10 @@ public interface Environment extends Context {
 	 * Returns the value of the '<em><b>Environment Model</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Environment Model</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Environment Model</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Environment Model</em>' reference.
 	 * @see #setEnvironmentModel(FunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#getEnvironment_EnvironmentModel()
@@ -136,7 +143,9 @@ public interface Environment extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel <em>Environment Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Environment Model</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Environment Model</em>' reference.
 	 * @see #getEnvironmentModel()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentFactory.java
index 2dc2678cba2..f50286bf384 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage
  * @generated
  */
 public interface EnvironmentFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	EnvironmentFactory eINSTANCE = org.eclipse.papyrus.eastadl.environment.impl.EnvironmentFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface EnvironmentFactory extends EFactory {
 	 * Returns a new object of class '<em>Clamp Connector</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Clamp Connector</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface EnvironmentFactory extends EFactory {
 	 * Returns a new object of class '<em>Environment</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Environment</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface EnvironmentFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentPackage.java
index 02461fa5a8a..036e363e81a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/EnvironmentPackage.java
@@ -26,104 +26,128 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The Environment model is used to describe the environment of the vehicle electric and electronic architecture. It is modeled by continuous functions representing the system environment.
+ * The Environment model is used to describe the environment of the vehicle electric and electronic architecture. It is modeled by continuous
+ * functions representing the system environment.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentFactory
  * @model kind="package"
  * @generated
  */
 public interface EnvironmentPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl
 		 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentPackageImpl#getEnvironment()
 		 * @generated
 		 */
 		EClass ENVIRONMENT = eINSTANCE.getEnvironment();
+
 		/**
 		 * The meta object literal for the '<em><b>Environment Model</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENVIRONMENT__ENVIRONMENT_MODEL = eINSTANCE.getEnvironment_EnvironmentModel();
+
 		/**
 		 * The meta object literal for the '<em><b>Clamp Connector</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENVIRONMENT__CLAMP_CONNECTOR = eINSTANCE.getEnvironment_ClampConnector();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENVIRONMENT__BASE_CLASS = eINSTANCE.getEnvironment_Base_Class();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENVIRONMENT__BASE_PACKAGE = eINSTANCE.getEnvironment_Base_Package();
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl <em>Clamp Connector</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl
 		 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentPackageImpl#getClampConnector()
 		 * @generated
 		 */
 		EClass CLAMP_CONNECTOR = eINSTANCE.getClampConnector();
+
 		/**
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAMP_CONNECTOR__PORT = eINSTANCE.getClampConnector_Port();
+
 		/**
 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAMP_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getClampConnector_Base_Connector();
+
 		/**
 		 * The meta object literal for the '<em><b>Port1 path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAMP_CONNECTOR__PORT1_PATH = eINSTANCE.getClampConnector_Port1_path();
+
 		/**
 		 * The meta object literal for the '<em><b>Port2 path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CLAMP_CONNECTOR__PORT2_PATH = eINSTANCE.getClampConnector_Port2_path();
@@ -134,6 +158,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "environment";
@@ -142,6 +167,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Environment/1";
@@ -150,6 +176,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Environment";
@@ -158,6 +185,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	EnvironmentPackage eINSTANCE = org.eclipse.papyrus.eastadl.environment.impl.EnvironmentPackageImpl.init();
@@ -166,6 +194,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl
 	 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentPackageImpl#getEnvironment()
 	 * @generated
@@ -176,6 +205,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -185,6 +215,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -194,6 +225,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -203,6 +235,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -212,6 +245,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -221,6 +255,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Environment Model</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -230,6 +265,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Clamp Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -239,6 +275,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -248,6 +285,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -257,6 +295,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The number of structural features of the '<em>Environment</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -266,6 +305,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl <em>Clamp Connector</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl
 	 * @see org.eclipse.papyrus.eastadl.environment.impl.EnvironmentPackageImpl#getClampConnector()
 	 * @generated
@@ -276,6 +316,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -285,6 +326,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -294,6 +336,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -303,6 +346,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -312,6 +356,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -321,6 +366,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Port1 path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -330,6 +376,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The feature id for the '<em><b>Port2 path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -339,6 +386,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * The number of structural features of the '<em>Clamp Connector</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -348,6 +396,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector <em>Clamp Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Clamp Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector
 	 * @generated
@@ -358,6 +407,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort()
 	 * @see #getClampConnector()
@@ -366,9 +416,11 @@ public interface EnvironmentPackage extends EPackage {
 	EReference getClampConnector_Port();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector <em>Base Connector</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector
+	 * <em>Base Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector#getBase_Connector()
 	 * @see #getClampConnector()
@@ -377,9 +429,11 @@ public interface EnvironmentPackage extends EPackage {
 	EReference getClampConnector_Base_Connector();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort1_path <em>Port1 path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort1_path
+	 * <em>Port1 path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port1 path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort1_path()
 	 * @see #getClampConnector()
@@ -388,9 +442,11 @@ public interface EnvironmentPackage extends EPackage {
 	EReference getClampConnector_Port1_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort2_path <em>Port2 path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort2_path
+	 * <em>Port2 path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port2 path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector#getPort2_path()
 	 * @see #getClampConnector()
@@ -402,6 +458,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.environment.Environment <em>Environment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Environment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment
 	 * @generated
@@ -409,9 +466,11 @@ public interface EnvironmentPackage extends EPackage {
 	EClass getEnvironment();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.Environment#getClampConnector <em>Clamp Connector</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.environment.Environment#getClampConnector
+	 * <em>Clamp Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Clamp Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment#getClampConnector()
 	 * @see #getEnvironment()
@@ -423,6 +482,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment#getBase_Class()
 	 * @see #getEnvironment()
@@ -434,6 +494,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.Environment#getBase_Package <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment#getBase_Package()
 	 * @see #getEnvironment()
@@ -442,9 +503,11 @@ public interface EnvironmentPackage extends EPackage {
 	EReference getEnvironment_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel <em>Environment Model</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel
+	 * <em>Environment Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Environment Model</em>'.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment#getEnvironmentModel()
 	 * @see #getEnvironment()
@@ -456,6 +519,7 @@ public interface EnvironmentPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/ClampConnectorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/ClampConnectorImpl.java
index 147c49775c2..c09e007c1bb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/ClampConnectorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/ClampConnectorImpl.java
@@ -45,13 +45,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.ClampConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ClampConnectorImpl extends EAElementImpl implements ClampConnector {
@@ -60,6 +60,7 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Connector()
 	 * @generated
 	 * @ordered
@@ -70,6 +71,7 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	 * The cached value of the '{@link #getPort1_path() <em>Port1 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort1_path()
 	 * @generated
 	 * @ordered
@@ -80,6 +82,7 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	 * The cached value of the '{@link #getPort2_path() <em>Port2 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort2_path()
 	 * @generated
 	 * @ordered
@@ -88,6 +91,7 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClampConnectorImpl() {
@@ -96,68 +100,73 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT:
-				return getPort();
-			case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
-				if (resolve) return getBase_Connector();
-				return basicGetBase_Connector();
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
-				return getPort1_path();
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
-				return getPort2_path();
+		switch(featureID) {
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT:
+			return getPort();
+		case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
+			if(resolve)
+				return getBase_Connector();
+			return basicGetBase_Connector();
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
+			return getPort1_path();
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
+			return getPort2_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT:
-				return !getPort().isEmpty();
-			case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
-				return base_Connector != null;
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
-				return port1_path != null && !port1_path.isEmpty();
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
-				return port2_path != null && !port2_path.isEmpty();
+		switch(featureID) {
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT:
+			return !getPort().isEmpty();
+		case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
+			return base_Connector != null;
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
+			return port1_path != null && !port1_path.isEmpty();
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
+			return port2_path != null && !port2_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)newValue);
-				return;
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				getPort1_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				getPort2_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)newValue);
+			return;
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			getPort1_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			getPort2_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,20 +176,21 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)null);
-				return;
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				return;
-			case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				return;
+		switch(featureID) {
+		case EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)null);
+			return;
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			return;
+		case EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -219,14 +229,15 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector getBase_Connector() {
-		if (base_Connector != null && base_Connector.eIsProxy()) {
+		if(base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
 			base_Connector = (Connector)eResolveProxy(oldBase_Connector);
-			if (base_Connector != oldBase_Connector) {
-				if (eNotificationRequired())
+			if(base_Connector != oldBase_Connector) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 			}
 		}
@@ -236,6 +247,7 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector basicGetBase_Connector() {
@@ -245,22 +257,24 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.CLAMP_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort1_path() {
-		if (port1_path == null) {
+		if(port1_path == null) {
 			port1_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, EnvironmentPackage.CLAMP_CONNECTOR__PORT1_PATH);
 		}
 		return port1_path;
@@ -269,10 +283,11 @@ public class ClampConnectorImpl extends EAElementImpl implements ClampConnector
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort2_path() {
-		if (port2_path == null) {
+		if(port2_path == null) {
 			port2_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, EnvironmentPackage.CLAMP_CONNECTOR__PORT2_PATH);
 		}
 		return port2_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentFactoryImpl.java
index 5ca95f0ab54..ec0112cf305 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.environment.*;
 import org.eclipse.papyrus.eastadl.environment.ClampConnector;
 import org.eclipse.papyrus.eastadl.environment.Environment;
 import org.eclipse.papyrus.eastadl.environment.EnvironmentFactory;
@@ -30,12 +31,15 @@ import org.eclipse.papyrus.eastadl.environment.EnvironmentPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -48,16 +52,16 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EnvironmentFactory init() {
 		try {
 			EnvironmentFactory theEnvironmentFactory = (EnvironmentFactory)EPackage.Registry.INSTANCE.getEFactory(EnvironmentPackage.eNS_URI);
-			if (theEnvironmentFactory != null) {
+			if(theEnvironmentFactory != null) {
 				return theEnvironmentFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new EnvironmentFactoryImpl();
@@ -67,6 +71,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentFactoryImpl() {
@@ -76,21 +81,25 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EnvironmentPackage.ENVIRONMENT: return createEnvironment();
-			case EnvironmentPackage.CLAMP_CONNECTOR: return createClampConnector();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case EnvironmentPackage.ENVIRONMENT:
+			return createEnvironment();
+		case EnvironmentPackage.CLAMP_CONNECTOR:
+			return createClampConnector();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClampConnector createClampConnector() {
@@ -101,6 +110,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Environment createEnvironment() {
@@ -111,6 +121,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentPackage getEnvironmentPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentImpl.java
index 33d005e1e12..69fc5501439 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentImpl.java
@@ -37,20 +37,22 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getEnvironmentModel <em>Environment Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getClampConnector <em>Clamp Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getEnvironmentModel <em>Environment Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getClampConnector <em>Clamp Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.environment.impl.EnvironmentImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EnvironmentImpl extends ContextImpl implements Environment {
+
 	/**
 	 * The cached value of the '{@link #getEnvironmentModel() <em>Environment Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEnvironmentModel()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	 * The cached value of the '{@link #getClampConnector() <em>Clamp Connector</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClampConnector()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -90,6 +95,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EnvironmentImpl() {
@@ -99,6 +105,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype basicGetEnvironmentModel() {
@@ -108,22 +115,26 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
-				if (resolve) return getEnvironmentModel();
-				return basicGetEnvironmentModel();
-			case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
-				return getClampConnector();
-			case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
+			if(resolve)
+				return getEnvironmentModel();
+			return basicGetEnvironmentModel();
+		case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
+			return getClampConnector();
+		case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -131,19 +142,20 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
-				return environmentModel != null;
-			case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
-				return clampConnector != null && !clampConnector.isEmpty();
-			case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
-				return base_Class != null;
-			case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
+			return environmentModel != null;
+		case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
+			return clampConnector != null && !clampConnector.isEmpty();
+		case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
+			return base_Class != null;
+		case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -151,25 +163,26 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
-				setEnvironmentModel((FunctionPrototype)newValue);
-				return;
-			case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
-				getClampConnector().clear();
-				getClampConnector().addAll((Collection<? extends ClampConnector>)newValue);
-				return;
-			case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
+			setEnvironmentModel((FunctionPrototype)newValue);
+			return;
+		case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
+			getClampConnector().clear();
+			getClampConnector().addAll((Collection<? extends ClampConnector>)newValue);
+			return;
+		case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -177,6 +190,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -187,23 +201,24 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
-				setEnvironmentModel((FunctionPrototype)null);
-				return;
-			case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
-				getClampConnector().clear();
-				return;
-			case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL:
+			setEnvironmentModel((FunctionPrototype)null);
+			return;
+		case EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR:
+			getClampConnector().clear();
+			return;
+		case EnvironmentPackage.ENVIRONMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -211,10 +226,11 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ClampConnector> getClampConnector() {
-		if (clampConnector == null) {
+		if(clampConnector == null) {
 			clampConnector = new EObjectResolvingEList<ClampConnector>(ClampConnector.class, this, EnvironmentPackage.ENVIRONMENT__CLAMP_CONNECTOR);
 		}
 		return clampConnector;
@@ -223,14 +239,15 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EnvironmentPackage.ENVIRONMENT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -240,6 +257,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -249,26 +267,28 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.ENVIRONMENT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -278,6 +298,7 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -287,26 +308,28 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.ENVIRONMENT__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype getEnvironmentModel() {
-		if (environmentModel != null && environmentModel.eIsProxy()) {
+		if(environmentModel != null && environmentModel.eIsProxy()) {
 			InternalEObject oldEnvironmentModel = (InternalEObject)environmentModel;
 			environmentModel = (FunctionPrototype)eResolveProxy(oldEnvironmentModel);
-			if (environmentModel != oldEnvironmentModel) {
-				if (eNotificationRequired())
+			if(environmentModel != oldEnvironmentModel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL, oldEnvironmentModel, environmentModel));
 			}
 		}
@@ -316,12 +339,13 @@ public class EnvironmentImpl extends ContextImpl implements Environment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEnvironmentModel(FunctionPrototype newEnvironmentModel) {
 		FunctionPrototype oldEnvironmentModel = environmentModel;
 		environmentModel = newEnvironmentModel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.ENVIRONMENT__ENVIRONMENT_MODEL, oldEnvironmentModel, environmentModel));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentPackageImpl.java
index 12128df7a88..a78f90b4826 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/impl/EnvironmentPackageImpl.java
@@ -85,6 +85,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentPackage {
@@ -92,6 +93,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass environmentEClass = null;
@@ -99,6 +101,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass clampConnectorEClass = null;
@@ -106,6 +109,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -113,16 +117,18 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * 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 EnvironmentPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link EnvironmentPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static EnvironmentPackage init() {
-		if (isInited) return (EnvironmentPackage)EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);
+		if(isInited)
+			return (EnvironmentPackage)EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);
 
 		// Obtain or create and register package
 		EnvironmentPackageImpl theEnvironmentPackage = (EnvironmentPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnvironmentPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnvironmentPackageImpl());
@@ -224,7 +230,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 		// Mark meta-data to indicate it can't be changed
 		theEnvironmentPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(EnvironmentPackage.eNS_URI, theEnvironmentPackage);
 		return theEnvironmentPackage;
@@ -233,6 +239,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -240,19 +247,19 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage#eNS_URI
 	 * @see #init()
@@ -263,14 +270,16 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -290,6 +299,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getClampConnector() {
@@ -299,6 +309,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClampConnector_Port() {
@@ -308,6 +319,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClampConnector_Base_Connector() {
@@ -317,6 +329,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClampConnector_Port1_path() {
@@ -326,6 +339,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getClampConnector_Port2_path() {
@@ -335,6 +349,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEnvironment() {
@@ -344,6 +359,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnvironment_ClampConnector() {
@@ -353,6 +369,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnvironment_Base_Class() {
@@ -362,6 +379,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnvironment_Base_Package() {
@@ -371,6 +389,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnvironment_EnvironmentModel() {
@@ -380,6 +399,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentFactory getEnvironmentFactory() {
@@ -387,14 +407,16 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentAdapterFactory.java
index 5eaf642d13f..11d5b4d2af7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.environment.*;
 import org.eclipse.papyrus.eastadl.environment.ClampConnector;
 import org.eclipse.papyrus.eastadl.environment.Environment;
 import org.eclipse.papyrus.eastadl.environment.EnvironmentPackage;
@@ -31,14 +32,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage
  * @generated
  */
 public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static EnvironmentPackage modelPackage;
@@ -47,40 +51,46 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected EnvironmentSwitch<Adapter> modelSwitch =
-		new EnvironmentSwitch<Adapter>() {
-			@Override
-			public Adapter caseEnvironment(Environment object) {
-				return createEnvironmentAdapter();
-			}
-			@Override
-			public Adapter caseClampConnector(ClampConnector object) {
-				return createClampConnectorAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected EnvironmentSwitch<Adapter> modelSwitch = new EnvironmentSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseEnvironment(Environment object) {
+			return createEnvironmentAdapter();
+		}
+
+		@Override
+		public Adapter caseClampConnector(ClampConnector object) {
+			return createClampConnectorAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = EnvironmentPackage.eINSTANCE;
 		}
 	}
@@ -89,7 +99,9 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -104,6 +116,7 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.environment.ClampConnector
 	 * @generated
@@ -118,6 +131,7 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -132,6 +146,7 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -146,6 +161,7 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.environment.Environment
 	 * @generated
@@ -159,6 +175,7 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -171,15 +188,16 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceFactoryImpl.java
index 27b6553574b..74458b11895 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.util.EnvironmentResourceImpl
  * @generated
  */
 public class EnvironmentResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class EnvironmentResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceImpl.java
index 7bd2be30488..3fcd6b7eb39 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.util.EnvironmentResourceFactoryImpl
  * @generated
  */
 public class EnvironmentResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public EnvironmentResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentSwitch.java
index 56b2bb4809c..c15cc2fac78 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.environment.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.environment.*;
 import org.eclipse.papyrus.eastadl.environment.ClampConnector;
 import org.eclipse.papyrus.eastadl.environment.Environment;
 import org.eclipse.papyrus.eastadl.environment.EnvironmentPackage;
@@ -28,21 +29,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.environment.EnvironmentPackage
  * @generated
  */
 public class EnvironmentSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static EnvironmentPackage modelPackage;
@@ -51,10 +54,11 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = EnvironmentPackage.eINSTANCE;
 		}
 	}
@@ -63,6 +67,7 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -78,7 +83,9 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Clamp Connector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -93,7 +100,9 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -108,7 +117,9 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -123,7 +134,9 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Environment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -138,7 +151,9 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -152,28 +167,37 @@ public class EnvironmentSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case EnvironmentPackage.ENVIRONMENT: {
-				Environment environment = (Environment)theEObject;
-				T result = caseEnvironment(environment);
-				if (result == null) result = caseContext(environment);
-				if (result == null) result = caseEAElement(environment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EnvironmentPackage.CLAMP_CONNECTOR: {
-				ClampConnector clampConnector = (ClampConnector)theEObject;
-				T result = caseClampConnector(clampConnector);
-				if (result == null) result = caseEAElement(clampConnector);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case EnvironmentPackage.ENVIRONMENT:
+		{
+			Environment environment = (Environment)theEObject;
+			T result = caseEnvironment(environment);
+			if(result == null)
+				result = caseContext(environment);
+			if(result == null)
+				result = caseEAElement(environment);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case EnvironmentPackage.CLAMP_CONNECTOR:
+		{
+			ClampConnector clampConnector = (ClampConnector)theEObject;
+			T result = caseClampConnector(clampConnector);
+			if(result == null)
+				result = caseEAElement(clampConnector);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentXMLProcessor.java
index ec06c69400c..885b342e363 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/environment/util/EnvironmentXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.environment.EnvironmentPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EnvironmentXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class EnvironmentXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnvironmentXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		EnvironmentPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the EnvironmentResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new EnvironmentResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new EnvironmentResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraint.java
index f940fff84e7..dd148c91917 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraint.java
@@ -26,52 +26,57 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Generic Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The GenericConstraint denotes a property, requirement, or a validation result for the identified element of the model. The kind of GenericConstraint is described as one of the GenericConstraintKind literals.
+ * The GenericConstraint denotes a property, requirement, or a validation result for the identified element of the model. The kind of
+ * GenericConstraint is described as one of the GenericConstraintKind literals.
  * 
- * Example: If the attribute genericConstraintType is cableLength, the genericConstraintValue could be "5 meters" (value of a numerical datatype with unit "meters").
+ * Example: If the attribute genericConstraintType is cableLength, the genericConstraintValue could be "5 meters" (value of a numerical datatype with
+ * unit "meters").
  * 
  * Semantics:
- * The GenericConstraint does not describe what is classically referred to as a design constraint but has the role of a property, requirement, or a validation result. It is a requirement if this GenericConstraint refines a Requirement (by the Refine relationship). The GenericConstraint is a validation result if it realizes a VVActualOutcome, it is an intended validation result if it realizes a VVIntendedOutcome, and in other cases it denotes a property.
+ * The GenericConstraint does not describe what is classically referred to as a design constraint but has the role of a property, requirement, or a
+ * validation result. It is a requirement if this GenericConstraint refines a Requirement (by the Refine relationship). The GenericConstraint is a
+ * validation result if it realizes a VVActualOutcome, it is an intended validation result if it realizes a VVIntendedOutcome, and in other cases it
+ * denotes a property.
  * 
  * 
  * 
  * Extension: Class, Constraint
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType <em>Design Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue <em>Generic Constraint Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType <em>Design Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue <em>Generic Constraint Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getMode <em>Mode</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint()
  * @model
  * @generated
  */
 public interface GenericConstraint extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Design Constraint Type</b></em>' attribute.
-	 * The default value is <code>""</code>.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Design Constraint Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Design Constraint Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Design Constraint Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
 	 * @see #setDesignConstraintType(GenericConstraintKind)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_DesignConstraintType()
-	 * @model default="" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	GenericConstraintKind getDesignConstraintType();
@@ -80,10 +85,11 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Generic Constraint Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Generic Constraint Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Generic Constraint Value</em>' containment reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generic Constraint Value</em>' attribute.
 	 * @see #setGenericConstraintValue(String)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_GenericConstraintValue()
@@ -97,10 +103,10 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_Mode()
 	 * @model ordered="false"
@@ -113,10 +119,10 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_Target()
 	 * @model ordered="false"
@@ -125,10 +131,13 @@ public interface GenericConstraint extends TraceableSpecification {
 	EList<NamedElement> getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType <em>Design Constraint Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType
+	 * <em>Design Constraint Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Design Constraint Type</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Design Constraint Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
 	 * @see #getDesignConstraintType()
 	 * @generated
@@ -139,10 +148,10 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Constraint</em>' reference.
 	 * @see #setBase_Constraint(Constraint)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_Base_Constraint()
@@ -152,20 +161,26 @@ public interface GenericConstraint extends TraceableSpecification {
 	Constraint getBase_Constraint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint <em>Base Constraint</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Constraint</em>' reference.
 	 * @see #getBase_Constraint()
 	 * @generated
 	 */
 	void setBase_Constraint(Constraint value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue <em>Generic Constraint Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue
+	 * <em>Generic Constraint Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generic Constraint Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Generic Constraint Value</em>' attribute.
 	 * @see #getGenericConstraintValue()
 	 * @generated
 	 */
@@ -175,10 +190,10 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraint_Base_Class()
@@ -191,7 +206,9 @@ public interface GenericConstraint extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintKind.java
index 9c342479342..70311fefa23 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintKind.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->
  * Enumeration for different type of constraints.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraintKind()
  * @model
  * @generated
@@ -38,6 +39,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Power Consumption</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POWER_CONSUMPTION_VALUE
 	 * @generated
 	 * @ordered
@@ -48,6 +50,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Other</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER_VALUE
 	 * @generated
 	 * @ordered
@@ -58,6 +61,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Piece Cost</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PIECE_COST_VALUE
 	 * @generated
 	 * @ordered
@@ -66,6 +70,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Weight</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #WEIGHT_VALUE
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Standard</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #STANDARD_VALUE
 	 * @generated
 	 * @ordered
@@ -82,6 +88,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Cable Length</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CABLE_LENGTH_VALUE
 	 * @generated
 	 * @ordered
@@ -90,6 +97,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Development Cost</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DEVELOPMENT_COST_VALUE
 	 * @generated
 	 * @ordered
@@ -98,22 +106,27 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Function Allocation Different Nodes</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #FUNCTION_ALLOCATION_DIFFERENT_NODES_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	FUNCTION_ALLOCATION_DIFFERENT_NODES(7, "functionAllocationDifferentNodes", "functionAllocationDifferentNodes"), /**
-	 * The '<em><b>Function Allocation Same Node</b></em>' literal object.
+	 * The '
+	 * <em><b>Function Allocation Same Node</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #FUNCTION_ALLOCATION_SAME_NODE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	FUNCTION_ALLOCATION_SAME_NODE(8, "functionAllocationSameNode", "functionAllocationSameNode"), /**
-	 * The '<em><b>Power Supply Independent</b></em>' literal object.
+	 * The '<em><b>Power Supply Independent</b></em>'
+	 * literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POWER_SUPPLY_INDEPENDENT_VALUE
 	 * @generated
 	 * @ordered
@@ -124,10 +137,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Power Consumption</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Power Consumption</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Power Consumption</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POWER_CONSUMPTION
 	 * @model name="powerConsumption"
 	 * @generated
@@ -139,10 +152,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Other</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Other</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Other</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER
 	 * @model name="other"
 	 * @generated
@@ -154,10 +167,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Piece Cost</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Piece Cost</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Piece Cost</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PIECE_COST
 	 * @model name="pieceCost"
 	 * @generated
@@ -169,10 +182,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Weight</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Weight</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Weight</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #WEIGHT
 	 * @model name="weight"
 	 * @generated
@@ -184,10 +197,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Standard</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Standard</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Standard</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #STANDARD
 	 * @model name="standard"
 	 * @generated
@@ -199,10 +212,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Cable Length</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Cable Length</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Cable Length</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CABLE_LENGTH
 	 * @model name="cableLength"
 	 * @generated
@@ -214,10 +227,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Development Cost</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Development Cost</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Development Cost</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DEVELOPMENT_COST
 	 * @model name="developmentCost"
 	 * @generated
@@ -229,10 +242,11 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Function Allocation Different Nodes</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Function Allocation Different Nodes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Function Allocation Different Nodes</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #FUNCTION_ALLOCATION_DIFFERENT_NODES
 	 * @model name="functionAllocationDifferentNodes"
 	 * @generated
@@ -244,10 +258,11 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Function Allocation Same Node</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Function Allocation Same Node</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Function Allocation Same Node</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #FUNCTION_ALLOCATION_SAME_NODE
 	 * @model name="functionAllocationSameNode"
 	 * @generated
@@ -259,10 +274,10 @@ public enum GenericConstraintKind implements Enumerator {
 	 * The '<em><b>Power Supply Independent</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Power Supply Independent</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Power Supply Independent</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POWER_SUPPLY_INDEPENDENT
 	 * @model name="powerSupplyIndependent"
 	 * @generated
@@ -274,26 +289,16 @@ public enum GenericConstraintKind implements Enumerator {
 	 * An array of all the '<em><b>Generic Constraint Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final GenericConstraintKind[] VALUES_ARRAY =
-		new GenericConstraintKind[] {
-			POWER_CONSUMPTION,
-			OTHER,
-			PIECE_COST,
-			WEIGHT,
-			STANDARD,
-			CABLE_LENGTH,
-			DEVELOPMENT_COST,
-			FUNCTION_ALLOCATION_DIFFERENT_NODES,
-			FUNCTION_ALLOCATION_SAME_NODE,
-			POWER_SUPPLY_INDEPENDENT,
-		};
+	private static final GenericConstraintKind[] VALUES_ARRAY = new GenericConstraintKind[]{ POWER_CONSUMPTION, OTHER, PIECE_COST, WEIGHT, STANDARD, CABLE_LENGTH, DEVELOPMENT_COST, FUNCTION_ALLOCATION_DIFFERENT_NODES, FUNCTION_ALLOCATION_SAME_NODE, POWER_SUPPLY_INDEPENDENT, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Generic Constraint Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<GenericConstraintKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -302,20 +307,31 @@ public enum GenericConstraintKind implements Enumerator {
 	 * Returns the '<em><b>Generic Constraint Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenericConstraintKind get(int value) {
-		switch (value) {
-			case POWER_CONSUMPTION_VALUE: return POWER_CONSUMPTION;
-			case OTHER_VALUE: return OTHER;
-			case PIECE_COST_VALUE: return PIECE_COST;
-			case WEIGHT_VALUE: return WEIGHT;
-			case STANDARD_VALUE: return STANDARD;
-			case CABLE_LENGTH_VALUE: return CABLE_LENGTH;
-			case DEVELOPMENT_COST_VALUE: return DEVELOPMENT_COST;
-			case FUNCTION_ALLOCATION_DIFFERENT_NODES_VALUE: return FUNCTION_ALLOCATION_DIFFERENT_NODES;
-			case FUNCTION_ALLOCATION_SAME_NODE_VALUE: return FUNCTION_ALLOCATION_SAME_NODE;
-			case POWER_SUPPLY_INDEPENDENT_VALUE: return POWER_SUPPLY_INDEPENDENT;
+		switch(value) {
+		case POWER_CONSUMPTION_VALUE:
+			return POWER_CONSUMPTION;
+		case OTHER_VALUE:
+			return OTHER;
+		case PIECE_COST_VALUE:
+			return PIECE_COST;
+		case WEIGHT_VALUE:
+			return WEIGHT;
+		case STANDARD_VALUE:
+			return STANDARD;
+		case CABLE_LENGTH_VALUE:
+			return CABLE_LENGTH;
+		case DEVELOPMENT_COST_VALUE:
+			return DEVELOPMENT_COST;
+		case FUNCTION_ALLOCATION_DIFFERENT_NODES_VALUE:
+			return FUNCTION_ALLOCATION_DIFFERENT_NODES;
+		case FUNCTION_ALLOCATION_SAME_NODE_VALUE:
+			return FUNCTION_ALLOCATION_SAME_NODE;
+		case POWER_SUPPLY_INDEPENDENT_VALUE:
+			return POWER_SUPPLY_INDEPENDENT;
 		}
 		return null;
 	}
@@ -324,12 +340,13 @@ public enum GenericConstraintKind implements Enumerator {
 	 * Returns the '<em><b>Generic Constraint Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenericConstraintKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			GenericConstraintKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -340,12 +357,13 @@ public enum GenericConstraintKind implements Enumerator {
 	 * Returns the '<em><b>Generic Constraint Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenericConstraintKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			GenericConstraintKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -355,6 +373,7 @@ public enum GenericConstraintKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -362,6 +381,7 @@ public enum GenericConstraintKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -369,6 +389,7 @@ public enum GenericConstraintKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -377,6 +398,7 @@ public enum GenericConstraintKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private GenericConstraintKind(int value, String name, String literal) {
@@ -388,39 +410,43 @@ public enum GenericConstraintKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //GenericConstraintKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintSet.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintSet.java
index 5e917d95970..dfd5af27311 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintSet.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericConstraintSet.java
@@ -23,34 +23,36 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Generic Constraint Set</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The collection of generic constraints. This collection can be done across the EAST-ADL2 abstraction levels.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getGenericConstraint <em>Generic Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getGenericConstraint <em>Generic Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraintSet()
  * @model
  * @generated
  */
 public interface GenericConstraintSet extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Generic Constraint</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Generic Constraint</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Generic Constraint</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generic Constraint</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraintSet_GenericConstraint()
 	 * @model ordered="false"
@@ -62,10 +64,10 @@ public interface GenericConstraintSet extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraintSet_Base_Package()
@@ -75,10 +77,13 @@ public interface GenericConstraintSet extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -88,10 +93,10 @@ public interface GenericConstraintSet extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getGenericConstraintSet_Base_Class()
@@ -101,10 +106,13 @@ public interface GenericConstraintSet extends Context {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsFactory.java
index 3a89086f25f..bb6a68ffa28 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage
  * @generated
  */
 public interface GenericconstraintsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	GenericconstraintsFactory eINSTANCE = org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface GenericconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Generic Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Generic Constraint</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface GenericconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Generic Constraint Set</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Generic Constraint Set</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface GenericconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Take Rate Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Take Rate Constraint</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface GenericconstraintsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsPackage.java
index dfe8641a9a9..0eb0d314f1b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/GenericconstraintsPackage.java
@@ -28,34 +28,40 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsFactory
  * @model kind="package"
  * @generated
  */
 public interface GenericconstraintsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl <em>Generic Constraint Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl
+		 * <em>Generic Constraint Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraintSet()
 		 * @generated
@@ -66,6 +72,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Generic Constraint</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT = eINSTANCE.getGenericConstraintSet_GenericConstraint();
@@ -74,6 +81,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT_SET__BASE_PACKAGE = eINSTANCE.getGenericConstraintSet_Base_Package();
@@ -82,14 +90,17 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT_SET__BASE_CLASS = eINSTANCE.getGenericConstraintSet_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl <em>Take Rate Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl
+		 * <em>Take Rate Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getTakeRateConstraint()
 		 * @generated
@@ -100,6 +111,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TAKE_RATE_CONSTRAINT__SOURCE = eINSTANCE.getTakeRateConstraint_Source();
@@ -108,14 +120,17 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Take Rate</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TAKE_RATE_CONSTRAINT__TAKE_RATE = eINSTANCE.getTakeRateConstraint_TakeRate();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl <em>Generic Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl
+		 * <em>Generic Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraint()
 		 * @generated
@@ -126,6 +141,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Design Constraint Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE = eINSTANCE.getGenericConstraint_DesignConstraintType();
@@ -134,6 +150,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getGenericConstraint_Base_Constraint();
@@ -142,6 +159,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Generic Constraint Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE = eINSTANCE.getGenericConstraint_GenericConstraintValue();
@@ -150,6 +168,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT__BASE_CLASS = eINSTANCE.getGenericConstraint_Base_Class();
@@ -158,6 +177,7 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT__TARGET = eINSTANCE.getGenericConstraint_Target();
@@ -166,14 +186,17 @@ public interface GenericconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_CONSTRAINT__MODE = eINSTANCE.getGenericConstraint_Mode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind <em>Generic Constraint Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
+		 * <em>Generic Constraint Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
 		 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraintKind()
 		 * @generated
@@ -186,6 +209,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "genericconstraints";
@@ -194,6 +218,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/GenericConstraints/1";
@@ -202,6 +227,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "GenericConstraints";
@@ -210,14 +236,17 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	GenericconstraintsPackage eINSTANCE = org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl <em>Generic Constraint Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl
+	 * <em>Generic Constraint Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraintSet()
 	 * @generated
@@ -225,9 +254,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	int GENERIC_CONSTRAINT_SET = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl <em>Generic Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl <em>Generic Constraint</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraint()
 	 * @generated
@@ -238,6 +269,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -247,6 +279,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -256,6 +289,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -265,6 +299,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -274,6 +309,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -283,6 +319,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Design Constraint Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -292,6 +329,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -301,6 +339,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Constraint Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -310,6 +349,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -319,6 +359,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -328,6 +369,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -337,6 +379,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Generic Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -346,6 +389,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -355,6 +399,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -364,6 +409,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -373,6 +419,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -382,6 +429,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -391,6 +439,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Constraint</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -400,6 +449,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -409,6 +459,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -418,6 +469,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Generic Constraint Set</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -425,9 +477,11 @@ public interface GenericconstraintsPackage extends EPackage {
 
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl <em>Take Rate Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl <em>Take Rate Constraint</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getTakeRateConstraint()
 	 * @generated
@@ -438,6 +492,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -447,6 +502,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -456,6 +512,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -465,6 +522,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -474,6 +532,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -483,6 +542,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Design Constraint Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -492,6 +552,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -501,6 +562,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Generic Constraint Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -510,6 +572,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -519,6 +582,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -528,6 +592,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -537,6 +602,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -546,6 +612,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Take Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -555,15 +622,18 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Take Rate Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TAKE_RATE_CONSTRAINT_FEATURE_COUNT = GENERIC_CONSTRAINT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind <em>Generic Constraint Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind <em>Generic Constraint Kind</em>}'
+	 * enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericconstraintsPackageImpl#getGenericConstraintKind()
 	 * @generated
@@ -574,6 +644,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint <em>Generic Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Generic Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint
 	 * @generated
@@ -581,9 +652,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EClass getGenericConstraint();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType <em>Design Constraint Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType
+	 * <em>Design Constraint Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Design Constraint Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getDesignConstraintType()
 	 * @see #getGenericConstraint()
@@ -592,9 +665,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EAttribute getGenericConstraint_DesignConstraintType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint <em>Base Constraint</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint
+	 * <em>Base Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Constraint()
 	 * @see #getGenericConstraint()
@@ -603,9 +678,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraint_Base_Constraint();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue <em>Generic Constraint Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue
+	 * <em>Generic Constraint Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Generic Constraint Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getGenericConstraintValue()
 	 * @see #getGenericConstraint()
@@ -614,9 +691,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EAttribute getGenericConstraint_GenericConstraintValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getBase_Class()
 	 * @see #getGenericConstraint()
@@ -625,9 +704,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraint_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getMode <em>Mode</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getMode <em>Mode</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Mode</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getMode()
 	 * @see #getGenericConstraint()
@@ -636,9 +717,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraint_Mode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getTarget
+	 * <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint#getTarget()
 	 * @see #getGenericConstraint()
@@ -647,9 +730,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraint_Target();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind <em>Generic Constraint Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind <em>Generic Constraint Kind</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Generic Constraint Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind
 	 * @generated
@@ -657,9 +742,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EEnum getGenericConstraintKind();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet <em>Generic Constraint Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet <em>Generic Constraint Set</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Generic Constraint Set</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet
 	 * @generated
@@ -667,9 +754,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EClass getGenericConstraintSet();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getGenericConstraint <em>Generic Constraint</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getGenericConstraint <em>Generic Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Generic Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getGenericConstraint()
 	 * @see #getGenericConstraintSet()
@@ -678,9 +767,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraintSet_GenericConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Package()
 	 * @see #getGenericConstraintSet()
@@ -689,9 +780,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getGenericConstraintSet_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet#getBase_Class()
 	 * @see #getGenericConstraintSet()
@@ -703,6 +796,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -712,6 +806,7 @@ public interface GenericconstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint <em>Take Rate Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Take Rate Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint
 	 * @generated
@@ -719,9 +814,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EClass getTakeRateConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getSource <em>Source</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getSource
+	 * <em>Source</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Source</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getSource()
 	 * @see #getTakeRateConstraint()
@@ -730,9 +827,11 @@ public interface GenericconstraintsPackage extends EPackage {
 	EReference getTakeRateConstraint_Source();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate <em>Take Rate</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate
+	 * <em>Take Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Take Rate</em>'.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate()
 	 * @see #getTakeRateConstraint()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/TakeRateConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/TakeRateConstraint.java
index 4032c7b79dc..e900e21787e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/TakeRateConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/TakeRateConstraint.java
@@ -22,29 +22,30 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Take Rate Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate <em>Take Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate <em>Take Rate</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getTakeRateConstraint()
  * @model
  * @generated
  */
 public interface TakeRateConstraint extends GenericConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Source</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getTakeRateConstraint_Source()
 	 * @model ordered="false"
@@ -56,10 +57,10 @@ public interface TakeRateConstraint extends GenericConstraint {
 	 * Returns the value of the '<em><b>Take Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Take Rate</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Take Rate</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Take Rate</em>' attribute.
 	 * @see #setTakeRate(Float)
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#getTakeRateConstraint_TakeRate()
@@ -72,7 +73,9 @@ public interface TakeRateConstraint extends GenericConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint#getTakeRate <em>Take Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Take Rate</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Take Rate</em>' attribute.
 	 * @see #getTakeRate()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintImpl.java
index 3a2d508b6ba..5fcf0ac4840 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintImpl.java
@@ -39,22 +39,24 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getDesignConstraintType <em>Design Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getGenericConstraintValue <em>Generic Constraint Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getDesignConstraintType <em>Design Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getGenericConstraintValue <em>Generic Constraint Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintImpl#getMode <em>Mode</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenericConstraintImpl extends TraceableSpecificationImpl implements GenericConstraint {
+
 	/**
 	 * The default value of the '{@link #getDesignConstraintType() <em>Design Constraint Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDesignConstraintType()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getDesignConstraintType() <em>Design Constraint Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDesignConstraintType()
 	 * @generated
 	 * @ordered
@@ -75,6 +78,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Constraint()
 	 * @generated
 	 * @ordered
@@ -85,6 +89,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The default value of the '{@link #getGenericConstraintValue() <em>Generic Constraint Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericConstraintValue()
 	 * @generated
 	 * @ordered
@@ -95,6 +100,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getGenericConstraintValue() <em>Generic Constraint Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericConstraintValue()
 	 * @generated
 	 * @ordered
@@ -105,6 +111,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -115,6 +122,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
@@ -125,6 +133,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	 * The cached value of the '{@link #getMode() <em>Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -134,6 +143,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GenericConstraintImpl() {
@@ -143,25 +153,28 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
-				return getDesignConstraintType();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
-				return getGenericConstraintValue();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
-				return getTarget();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
-				return getMode();
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
+			return getDesignConstraintType();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
+			if(resolve)
+				return getBase_Constraint();
+			return basicGetBase_Constraint();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
+			return getGenericConstraintValue();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
+			return getTarget();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
+			return getMode();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -169,23 +182,24 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
-				return designConstraintType != DESIGN_CONSTRAINT_TYPE_EDEFAULT;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
-				return base_Constraint != null;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
-				return GENERIC_CONSTRAINT_VALUE_EDEFAULT == null ? genericConstraintValue != null : !GENERIC_CONSTRAINT_VALUE_EDEFAULT.equals(genericConstraintValue);
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
-				return base_Class != null;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
-				return target != null && !target.isEmpty();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
-				return mode != null && !mode.isEmpty();
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
+			return designConstraintType != DESIGN_CONSTRAINT_TYPE_EDEFAULT;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
+			return base_Constraint != null;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
+			return GENERIC_CONSTRAINT_VALUE_EDEFAULT == null ? genericConstraintValue != null : !GENERIC_CONSTRAINT_VALUE_EDEFAULT.equals(genericConstraintValue);
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
+			return base_Class != null;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
+			return target != null && !target.isEmpty();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
+			return mode != null && !mode.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -193,32 +207,33 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
-				setDesignConstraintType((GenericConstraintKind)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
-				setGenericConstraintValue((String)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
-				getTarget().clear();
-				getTarget().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
+			setDesignConstraintType((GenericConstraintKind)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
+			setGenericConstraintValue((String)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
+			getTarget().clear();
+			getTarget().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -226,6 +241,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -236,29 +252,30 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
-				setDesignConstraintType(DESIGN_CONSTRAINT_TYPE_EDEFAULT);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
-				setGenericConstraintValue(GENERIC_CONSTRAINT_VALUE_EDEFAULT);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
-				getTarget().clear();
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
-				getMode().clear();
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE:
+			setDesignConstraintType(DESIGN_CONSTRAINT_TYPE_EDEFAULT);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)null);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE:
+			setGenericConstraintValue(GENERIC_CONSTRAINT_VALUE_EDEFAULT);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET:
+			getTarget().clear();
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE:
+			getMode().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -266,6 +283,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericConstraintKind getDesignConstraintType() {
@@ -275,6 +293,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getGenericConstraintValue() {
@@ -284,10 +303,11 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, GenericconstraintsPackage.GENERIC_CONSTRAINT__MODE);
 		}
 		return mode;
@@ -296,10 +316,11 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getTarget() {
-		if (target == null) {
+		if(target == null) {
 			target = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, GenericconstraintsPackage.GENERIC_CONSTRAINT__TARGET);
 		}
 		return target;
@@ -308,26 +329,28 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDesignConstraintType(GenericConstraintKind newDesignConstraintType) {
 		GenericConstraintKind oldDesignConstraintType = designConstraintType;
 		designConstraintType = newDesignConstraintType == null ? DESIGN_CONSTRAINT_TYPE_EDEFAULT : newDesignConstraintType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT__DESIGN_CONSTRAINT_TYPE, oldDesignConstraintType, designConstraintType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
+		if(base_Constraint != null && base_Constraint.eIsProxy()) {
 			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
 			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
+			if(base_Constraint != oldBase_Constraint) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 			}
 		}
@@ -337,6 +360,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint basicGetBase_Constraint() {
@@ -346,38 +370,41 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Constraint(Constraint newBase_Constraint) {
 		Constraint oldBase_Constraint = base_Constraint;
 		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGenericConstraintValue(String newGenericConstraintValue) {
 		String oldGenericConstraintValue = genericConstraintValue;
 		genericConstraintValue = newGenericConstraintValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT__GENERIC_CONSTRAINT_VALUE, oldGenericConstraintValue, genericConstraintValue));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -387,6 +414,7 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -396,23 +424,26 @@ public class GenericConstraintImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (designConstraintType: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintSetImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintSetImpl.java
index 06ebb79a69b..2dfc0961dae 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintSetImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericConstraintSetImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getGenericConstraint <em>Generic Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getGenericConstraint <em>Generic Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.GenericConstraintSetImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenericConstraintSetImpl extends ContextImpl implements GenericConstraintSet {
+
 	/**
 	 * The cached value of the '{@link #getGenericConstraint() <em>Generic Constraint</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getGenericConstraint()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GenericConstraintSetImpl() {
@@ -87,19 +92,22 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
-				return getGenericConstraint();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
+			return getGenericConstraint();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +115,18 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
-				return genericConstraint != null && !genericConstraint.isEmpty();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
-				return base_Package != null;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
+			return genericConstraint != null && !genericConstraint.isEmpty();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
+			return base_Package != null;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,22 +134,23 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
-				getGenericConstraint().clear();
-				getGenericConstraint().addAll((Collection<? extends GenericConstraint>)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
+			getGenericConstraint().clear();
+			getGenericConstraint().addAll((Collection<? extends GenericConstraint>)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,20 +169,21 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
-				getGenericConstraint().clear();
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT:
+			getGenericConstraint().clear();
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -179,10 +191,11 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<GenericConstraint> getGenericConstraint() {
-		if (genericConstraint == null) {
+		if(genericConstraint == null) {
 			genericConstraint = new EObjectResolvingEList<GenericConstraint>(GenericConstraint.class, this, GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__GENERIC_CONSTRAINT);
 		}
 		return genericConstraint;
@@ -191,14 +204,15 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -208,6 +222,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -217,26 +232,28 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -246,6 +263,7 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -255,12 +273,13 @@ public class GenericConstraintSetImpl extends ContextImpl implements GenericCons
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.GENERIC_CONSTRAINT_SET__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsFactoryImpl.java
index ffbc7228bc2..bd71285c7aa 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.genericconstraints.*;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintKind;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet;
@@ -33,12 +34,15 @@ import org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class GenericconstraintsFactoryImpl extends EFactoryImpl implements GenericconstraintsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -51,16 +55,16 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenericconstraintsFactory init() {
 		try {
 			GenericconstraintsFactory theGenericconstraintsFactory = (GenericconstraintsFactory)EPackage.Registry.INSTANCE.getEFactory(GenericconstraintsPackage.eNS_URI);
-			if (theGenericconstraintsFactory != null) {
+			if(theGenericconstraintsFactory != null) {
 				return theGenericconstraintsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new GenericconstraintsFactoryImpl();
@@ -70,6 +74,7 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsFactoryImpl() {
@@ -79,6 +84,7 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertGenericConstraintKindToString(EDataType eDataType, Object instanceValue) {
@@ -88,52 +94,59 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_KIND:
-				return convertGenericConstraintKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_KIND:
+			return convertGenericConstraintKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT: return createGenericConstraint();
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET: return createGenericConstraintSet();
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT: return createTakeRateConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT:
+			return createGenericConstraint();
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET:
+			return createGenericConstraintSet();
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT:
+			return createTakeRateConstraint();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_KIND:
-				return createGenericConstraintKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_KIND:
+			return createGenericConstraintKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericConstraint createGenericConstraint() {
@@ -144,17 +157,20 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericConstraintKind createGenericConstraintKindFromString(EDataType eDataType, String initialValue) {
 		GenericConstraintKind result = GenericConstraintKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericConstraintSet createGenericConstraintSet() {
@@ -165,6 +181,7 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TakeRateConstraint createTakeRateConstraint() {
@@ -175,6 +192,7 @@ public class GenericconstraintsFactoryImpl extends EFactoryImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsPackage getGenericconstraintsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsPackageImpl.java
index 76a7afb7088..b7c5b7da162 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/GenericconstraintsPackageImpl.java
@@ -90,6 +90,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class GenericconstraintsPackageImpl extends EPackageImpl implements GenericconstraintsPackage {
@@ -97,6 +98,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass genericConstraintSetEClass = null;
@@ -104,6 +106,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass takeRateConstraintEClass = null;
@@ -111,6 +114,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass genericConstraintEClass = null;
@@ -118,6 +122,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum genericConstraintKindEEnum = null;
@@ -125,6 +130,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -132,16 +138,18 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * 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 GenericconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link GenericconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static GenericconstraintsPackage init() {
-		if (isInited) return (GenericconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(GenericconstraintsPackage.eNS_URI);
+		if(isInited)
+			return (GenericconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(GenericconstraintsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		GenericconstraintsPackageImpl theGenericconstraintsPackage = (GenericconstraintsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GenericconstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new GenericconstraintsPackageImpl());
@@ -243,7 +251,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 		// Mark meta-data to indicate it can't be changed
 		theGenericconstraintsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(GenericconstraintsPackage.eNS_URI, theGenericconstraintsPackage);
 		return theGenericconstraintsPackage;
@@ -252,6 +260,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -259,19 +268,19 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage#eNS_URI
 	 * @see #init()
@@ -282,14 +291,16 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -317,6 +328,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGenericConstraint() {
@@ -326,6 +338,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGenericConstraint_DesignConstraintType() {
@@ -335,6 +348,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraint_Base_Constraint() {
@@ -344,6 +358,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGenericConstraint_GenericConstraintValue() {
@@ -353,6 +368,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraint_Base_Class() {
@@ -362,6 +378,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraint_Mode() {
@@ -371,6 +388,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraint_Target() {
@@ -380,6 +398,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getGenericConstraintKind() {
@@ -389,6 +408,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGenericConstraintSet() {
@@ -398,6 +418,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraintSet_GenericConstraint() {
@@ -407,6 +428,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraintSet_Base_Package() {
@@ -416,6 +438,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericConstraintSet_Base_Class() {
@@ -425,6 +448,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsFactory getGenericconstraintsFactory() {
@@ -434,6 +458,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTakeRateConstraint() {
@@ -443,6 +468,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTakeRateConstraint_Source() {
@@ -452,6 +478,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTakeRateConstraint_TakeRate() {
@@ -459,14 +486,16 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -492,7 +521,7 @@ public class GenericconstraintsPackageImpl extends EPackageImpl implements Gener
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(genericConstraintEClass, GenericConstraint.class, "GenericConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenericConstraint_DesignConstraintType(), this.getGenericConstraintKind(), "designConstraintType", "", 0, 1, GenericConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getGenericConstraint_DesignConstraintType(), this.getGenericConstraintKind(), "designConstraintType", null, 0, 1, GenericConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getGenericConstraint_Base_Constraint(), theUMLPackage.getConstraint(), null, "base_Constraint", null, 0, 1, GenericConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getGenericConstraint_GenericConstraintValue(), theTypesPackage.getString(), "genericConstraintValue", null, 1, 1, GenericConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getGenericConstraint_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 0, 1, GenericConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/TakeRateConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/TakeRateConstraintImpl.java
index 76221accc47..8a27cc4a83c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/TakeRateConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/impl/TakeRateConstraintImpl.java
@@ -34,18 +34,20 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl#getTakeRate <em>Take Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.genericconstraints.impl.TakeRateConstraintImpl#getTakeRate <em>Take Rate</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TakeRateConstraintImpl extends GenericConstraintImpl implements TakeRateConstraint {
+
 	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -56,6 +58,7 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	 * The default value of the '{@link #getTakeRate() <em>Take Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTakeRate()
 	 * @generated
 	 * @ordered
@@ -66,6 +69,7 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	 * The cached value of the '{@link #getTakeRate() <em>Take Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTakeRate()
 	 * @generated
 	 * @ordered
@@ -75,6 +79,7 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TakeRateConstraintImpl() {
@@ -84,15 +89,16 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
-				return getSource();
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
-				return getTakeRate();
+		switch(featureID) {
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
+			return getSource();
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
+			return getTakeRate();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -100,15 +106,16 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
-				return source != null && !source.isEmpty();
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
-				return TAKE_RATE_EDEFAULT == null ? takeRate != null : !TAKE_RATE_EDEFAULT.equals(takeRate);
+		switch(featureID) {
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
+			return source != null && !source.isEmpty();
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
+			return TAKE_RATE_EDEFAULT == null ? takeRate != null : !TAKE_RATE_EDEFAULT.equals(takeRate);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -116,19 +123,20 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
-				getSource().clear();
-				getSource().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
-				setTakeRate((Float)newValue);
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
+			getSource().clear();
+			getSource().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
+			setTakeRate((Float)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -136,6 +144,7 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,17 +155,18 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
-				getSource().clear();
-				return;
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
-				setTakeRate(TAKE_RATE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE:
+			getSource().clear();
+			return;
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE:
+			setTakeRate(TAKE_RATE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -164,10 +174,11 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getSource() {
-		if (source == null) {
+		if(source == null) {
 			source = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__SOURCE);
 		}
 		return source;
@@ -176,6 +187,7 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getTakeRate() {
@@ -185,23 +197,26 @@ public class TakeRateConstraintImpl extends GenericConstraintImpl implements Tak
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTakeRate(Float newTakeRate) {
 		Float oldTakeRate = takeRate;
 		takeRate = newTakeRate;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, GenericconstraintsPackage.TAKE_RATE_CONSTRAINT__TAKE_RATE, oldTakeRate, takeRate));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (takeRate: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsAdapterFactory.java
index 55d185d2ff4..dfc5d54d246 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.genericconstraints.*;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage;
@@ -34,14 +35,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage
  * @generated
  */
 public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static GenericconstraintsPackage modelPackage;
@@ -50,52 +54,61 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected GenericconstraintsSwitch<Adapter> modelSwitch =
-		new GenericconstraintsSwitch<Adapter>() {
-			@Override
-			public Adapter caseGenericConstraint(GenericConstraint object) {
-				return createGenericConstraintAdapter();
-			}
-			@Override
-			public Adapter caseGenericConstraintSet(GenericConstraintSet object) {
-				return createGenericConstraintSetAdapter();
-			}
-			@Override
-			public Adapter caseTakeRateConstraint(TakeRateConstraint object) {
-				return createTakeRateConstraintAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected GenericconstraintsSwitch<Adapter> modelSwitch = new GenericconstraintsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseGenericConstraint(GenericConstraint object) {
+			return createGenericConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseGenericConstraintSet(GenericConstraintSet object) {
+			return createGenericConstraintSetAdapter();
+		}
+
+		@Override
+		public Adapter caseTakeRateConstraint(TakeRateConstraint object) {
+			return createTakeRateConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = GenericconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -104,7 +117,9 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -119,6 +134,7 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -132,6 +148,7 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -140,11 +157,13 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint <em>Generic Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint
+	 * <em>Generic Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint
 	 * @generated
@@ -154,11 +173,13 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet <em>Generic Constraint Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet
+	 * <em>Generic Constraint Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet
 	 * @generated
@@ -168,11 +189,13 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint <em>Take Rate Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint
+	 * <em>Take Rate Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.genericconstraints.TakeRateConstraint
 	 * @generated
@@ -187,6 +210,7 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -196,11 +220,13 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -210,11 +236,13 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -228,15 +256,16 @@ public class GenericconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceFactoryImpl.java
index b0ea060bc5c..eee81334aa5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.util.GenericconstraintsResourceImpl
  * @generated
  */
 public class GenericconstraintsResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class GenericconstraintsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceImpl.java
index 52c666c68f3..0740b5200cc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.util.GenericconstraintsResourceFactoryImpl
  * @generated
  */
 public class GenericconstraintsResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public GenericconstraintsResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsSwitch.java
index 3e9c6e84835..477466c1fa4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.genericconstraints.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.genericconstraints.*;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraint;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericConstraintSet;
 import org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage;
@@ -31,21 +32,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage
  * @generated
  */
 public class GenericconstraintsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static GenericconstraintsPackage modelPackage;
@@ -54,10 +57,11 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = GenericconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -66,6 +70,7 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -81,7 +86,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -96,7 +103,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Generic Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -111,7 +120,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Generic Constraint Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -126,7 +137,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Take Rate Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -141,7 +154,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -156,7 +171,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -171,7 +188,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -186,7 +205,9 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -200,40 +221,57 @@ public class GenericconstraintsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT: {
-				GenericConstraint genericConstraint = (GenericConstraint)theEObject;
-				T result = caseGenericConstraint(genericConstraint);
-				if (result == null) result = caseTraceableSpecification(genericConstraint);
-				if (result == null) result = caseEAPackageableElement(genericConstraint);
-				if (result == null) result = caseEAElement(genericConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET: {
-				GenericConstraintSet genericConstraintSet = (GenericConstraintSet)theEObject;
-				T result = caseGenericConstraintSet(genericConstraintSet);
-				if (result == null) result = caseContext(genericConstraintSet);
-				if (result == null) result = caseEAElement(genericConstraintSet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT: {
-				TakeRateConstraint takeRateConstraint = (TakeRateConstraint)theEObject;
-				T result = caseTakeRateConstraint(takeRateConstraint);
-				if (result == null) result = caseGenericConstraint(takeRateConstraint);
-				if (result == null) result = caseTraceableSpecification(takeRateConstraint);
-				if (result == null) result = caseEAPackageableElement(takeRateConstraint);
-				if (result == null) result = caseEAElement(takeRateConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT:
+		{
+			GenericConstraint genericConstraint = (GenericConstraint)theEObject;
+			T result = caseGenericConstraint(genericConstraint);
+			if(result == null)
+				result = caseTraceableSpecification(genericConstraint);
+			if(result == null)
+				result = caseEAPackageableElement(genericConstraint);
+			if(result == null)
+				result = caseEAElement(genericConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case GenericconstraintsPackage.GENERIC_CONSTRAINT_SET:
+		{
+			GenericConstraintSet genericConstraintSet = (GenericConstraintSet)theEObject;
+			T result = caseGenericConstraintSet(genericConstraintSet);
+			if(result == null)
+				result = caseContext(genericConstraintSet);
+			if(result == null)
+				result = caseEAElement(genericConstraintSet);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case GenericconstraintsPackage.TAKE_RATE_CONSTRAINT:
+		{
+			TakeRateConstraint takeRateConstraint = (TakeRateConstraint)theEObject;
+			T result = caseTakeRateConstraint(takeRateConstraint);
+			if(result == null)
+				result = caseGenericConstraint(takeRateConstraint);
+			if(result == null)
+				result = caseTraceableSpecification(takeRateConstraint);
+			if(result == null)
+				result = caseEAPackageableElement(takeRateConstraint);
+			if(result == null)
+				result = caseEAElement(takeRateConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsXMLProcessor.java
index 5e7caec9d41..1e157d5f405 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/genericconstraints/util/GenericconstraintsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.genericconstraints.GenericconstraintsPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class GenericconstraintsXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class GenericconstraintsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericconstraintsXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		GenericconstraintsPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the GenericconstraintsResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new GenericconstraintsResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new GenericconstraintsResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlFactoryImpl.java
index 52a90510a9d..9de279a8612 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.*;

 import org.eclipse.papyrus.eastadl.EastadlFactory;

 import org.eclipse.papyrus.eastadl.EastadlPackage;

 import org.eclipse.papyrus.eastadl.dummy;

@@ -28,12 +29,14 @@ import org.eclipse.papyrus.eastadl.dummy;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class EastadlFactoryImpl extends EFactoryImpl implements EastadlFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -45,16 +48,16 @@ public class EastadlFactoryImpl extends EFactoryImpl implements EastadlFactory {
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static EastadlFactory init() {

 		try {

 			EastadlFactory theEastadlFactory = (EastadlFactory)EPackage.Registry.INSTANCE.getEFactory(EastadlPackage.eNS_URI);

-			if (theEastadlFactory != null) {

+			if(theEastadlFactory != null) {

 				return theEastadlFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new EastadlFactoryImpl();

@@ -63,6 +66,7 @@ public class EastadlFactoryImpl extends EFactoryImpl implements EastadlFactory {
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EastadlFactoryImpl() {

@@ -71,32 +75,36 @@ public class EastadlFactoryImpl extends EFactoryImpl implements EastadlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case EastadlPackage.DUMMY:

-				return convertdummyToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case EastadlPackage.DUMMY:

+			return convertdummyToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public dummy createdummyFromString(EDataType eDataType, String initialValue) {

 		dummy result = dummy.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertdummyToString(EDataType eDataType, Object instanceValue) {

@@ -105,32 +113,35 @@ public class EastadlFactoryImpl extends EFactoryImpl implements EastadlFactory {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case EastadlPackage.DUMMY:

-				return createdummyFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case EastadlPackage.DUMMY:

+			return createdummyFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EastadlPackage getEastadlPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlPackageImpl.java
index 5924a758578..e256ee29068 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/impl/EastadlPackageImpl.java
@@ -80,6 +80,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {

@@ -87,12 +88,14 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum dummyEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -100,16 +103,18 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 	/**

 	 * 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 EastadlPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link EastadlPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static EastadlPackage init() {

-		if (isInited) return (EastadlPackage)EPackage.Registry.INSTANCE.getEPackage(EastadlPackage.eNS_URI);

+		if(isInited)

+			return (EastadlPackage)EPackage.Registry.INSTANCE.getEPackage(EastadlPackage.eNS_URI);

 

 		// Obtain or create and register package

 		EastadlPackageImpl theEastadlPackage = (EastadlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EastadlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EastadlPackageImpl());

@@ -211,7 +216,7 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 		// Mark meta-data to indicate it can't be changed

 		theEastadlPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(EastadlPackage.eNS_URI, theEastadlPackage);

 		return theEastadlPackage;

@@ -220,6 +225,7 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getdummy() {

@@ -228,25 +234,26 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.EastadlPackage#eNS_URI

 	 * @see #init()

@@ -257,13 +264,15 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create enums

@@ -272,6 +281,7 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EastadlFactory getEastadlFactory() {

@@ -279,13 +289,15 @@ public class EastadlPackageImpl extends EPackageImpl implements EastadlPackage {
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructureFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructureFactory.java
index f4f8a61da75..d50f8c9325e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructureFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructureFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.InfrastructurePackage
  * @generated
  */
 public interface InfrastructureFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	InfrastructureFactory eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.impl.InfrastructureFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface InfrastructureFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructurePackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructurePackage.java
index 4d4cbf6cc32..e6e7f078f3d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructurePackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/InfrastructurePackage.java
@@ -23,40 +23,48 @@ import org.eclipse.emf.ecore.EPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * This section contains the UML-profile specification, specifying stereotypes in the UML-profile, defined from the metaclasses in the ADLCoreConstructs package. It includes specification details for each stereotype. If the stereotype has properties, which may be referred to as tag definitions, or if the stereotype has constraints, this section also includes specification details for these properties and constraints.
+ * This section contains the UML-profile specification, specifying stereotypes in the UML-profile, defined from the metaclasses in the
+ * ADLCoreConstructs package. It includes specification details for each stereotype. If the stereotype has properties, which may be referred to as tag
+ * definitions, or if the stereotype has constraints, this section also includes specification details for these properties and constraints.
  * 
  * Overview:
- * This subprofile defines a set of abstract stereotypes which provide basic constructs to the other subprofiles. Two subprofiles are also defined, ADLTypes and ADLRelationshipModeling which are described in the following sections.
+ * This subprofile defines a set of abstract stereotypes which provide basic constructs to the other subprofiles. Two subprofiles are also defined,
+ * ADLTypes and ADLRelationshipModeling which are described in the following sections.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.InfrastructureFactory
  * @model kind="package"
  * @generated
  */
 public interface InfrastructurePackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '<em>Dummy</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.impl.InfrastructurePackageImpl#getDummy()
 		 * @generated
@@ -69,6 +77,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "infrastructure";
@@ -77,6 +86,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Infrastructure/1";
@@ -85,6 +95,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Infrastructure";
@@ -93,6 +104,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	InfrastructurePackage eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.impl.InfrastructurePackageImpl.init();
@@ -101,6 +113,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * The meta object id for the '<em>Dummy</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.impl.InfrastructurePackageImpl#getDummy()
 	 * @generated
@@ -111,6 +124,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Dummy</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -122,6 +136,7 @@ public interface InfrastructurePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/CompositeDatatype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/CompositeDatatype.java
index 8216aab0fa5..55ba19b0552 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/CompositeDatatype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/CompositeDatatype.java
@@ -21,40 +21,45 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Composite Datatype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * A CompositeDatatype represents a non-scalar datatype. Take as an example a CompositeDatatype "MyCountries" that can refer, e.g., to an Enumeration "CountryEnumeration" {USA, Canada, Japan, EU} via two EADatatypePrototypes (record variables): FirstCountry and SecondCountry. Then an attribute typed by this CompositeDatatype "MyCountries" may have a value like: (EU (identified as FirstCountry), Japan (identified as SecondCountry)).
+ * A CompositeDatatype represents a non-scalar datatype. Take as an example a CompositeDatatype "MyCountries" that can refer, e.g., to an Enumeration
+ * "CountryEnumeration" {USA, Canada, Japan, EU} via two EADatatypePrototypes (record variables): FirstCountry and SecondCountry. Then an attribute
+ * typed by this CompositeDatatype "MyCountries" may have a value like: (EU (identified as FirstCountry), Japan (identified as SecondCountry)).
  * 
  * Semantics:
- * A CompositeDatatype represents a non-scalar datatype. The contained datatypePrototypes act as record variables to identify the ordered datatype instances of the tuple (the CompositeDatatype).
+ * A CompositeDatatype represents a non-scalar datatype. The contained datatypePrototypes act as record variables to identify the ordered datatype
+ * instances of the tuple (the CompositeDatatype).
  * 
  * Notation:
  * The datatype CompositeDatatype is denoted using the rectangle symbol with keyword «Datatype CompositeDatatype».
  * 
  * Extension: UML Datatype
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype#getDatatypePrototype <em>Datatype Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype#getDatatypePrototype <em>Datatype Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getCompositeDatatype()
  * @model
  * @generated
  */
 public interface CompositeDatatype extends EADatatype {
+
 	/**
 	 * Returns the value of the '<em><b>Datatype Prototype</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Datatype Prototype</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Datatype Prototype</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Datatype Prototype</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getCompositeDatatype_DatatypePrototype()
 	 * @model required="true"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesFactory.java
index 5c9d6605730..0a1dc86630b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage
  * @generated
  */
 public interface DatatypesFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DatatypesFactory eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>EA Datatype Prototype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA Datatype Prototype</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Composite Datatype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Composite Datatype</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>EA String</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA String</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>EA Boolean</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA Boolean</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>EA Float</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA Float</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>EA Integer</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA Integer</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Enumeration Literal</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Enumeration Literal</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Enumeration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Enumeration</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Enumeration Value Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Enumeration Value Type</em>'.
 	 * @generated
 	 */
@@ -119,6 +131,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns a new object of class '<em>Rangeable Value Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Rangeable Value Type</em>'.
 	 * @generated
 	 */
@@ -128,6 +141,7 @@ public interface DatatypesFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesPackage.java
index b779f1a164c..53cc4d2988e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/DatatypesPackage.java
@@ -28,39 +28,46 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The Datatypes subpackage of EAST-ADL2 defines EAST-ADL2 general-purpose datatypes that may be used to type structural constructs in several different modeling diagrams.
+ * The Datatypes subpackage of EAST-ADL2 defines EAST-ADL2 general-purpose datatypes that may be used to type structural constructs in several
+ * different modeling diagrams.
  * 
  * The purpose of the metaclasses in the Datatypes subpackage is to specify the concepts for the specific domain.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesFactory
  * @model kind="package"
  * @generated
  */
 public interface DatatypesPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl <em>EA Datatype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl <em>EA Datatype</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEADatatype()
 		 * @generated
@@ -71,14 +78,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Data Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_DATATYPE__BASE_DATA_TYPE = eINSTANCE.getEADatatype_Base_DataType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl <em>Rangeable Datatype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl
+		 * <em>Rangeable Datatype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getRangeableDatatype()
 		 * @generated
@@ -86,9 +96,11 @@ public interface DatatypesPackage extends EPackage {
 		EClass RANGEABLE_DATATYPE = eINSTANCE.getRangeableDatatype();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl <em>EA Datatype Prototype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl
+		 * <em>EA Datatype Prototype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEADatatypePrototype()
 		 * @generated
@@ -99,6 +111,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_DATATYPE_PROTOTYPE__TYPE = eINSTANCE.getEADatatypePrototype_Type();
@@ -107,6 +120,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_DATATYPE_PROTOTYPE__BASE_PROPERTY = eINSTANCE.getEADatatypePrototype_Base_Property();
@@ -115,14 +129,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_DATATYPE_PROTOTYPE__BASE_PARAMETER = eINSTANCE.getEADatatypePrototype_Base_Parameter();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl <em>Value Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl <em>Value Type</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getValueType()
 		 * @generated
@@ -133,6 +150,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Semantics</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VALUE_TYPE__SEMANTICS = eINSTANCE.getValueType_Semantics();
@@ -141,6 +159,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Dimension</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VALUE_TYPE__DIMENSION = eINSTANCE.getValueType_Dimension();
@@ -149,14 +168,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VALUE_TYPE__UNIT = eINSTANCE.getValueType_Unit();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl <em>Rangeable Value Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl
+		 * <em>Rangeable Value Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getRangeableValueType()
 		 * @generated
@@ -167,6 +189,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Accuracy</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RANGEABLE_VALUE_TYPE__ACCURACY = eINSTANCE.getRangeableValueType_Accuracy();
@@ -175,6 +198,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Resolution</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RANGEABLE_VALUE_TYPE__RESOLUTION = eINSTANCE.getRangeableValueType_Resolution();
@@ -183,14 +207,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Significant Digits</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS = eINSTANCE.getRangeableValueType_SignificantDigits();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl <em>Enumeration Value Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl
+		 * <em>Enumeration Value Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumerationValueType()
 		 * @generated
@@ -201,6 +228,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Multi Valued</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED = eINSTANCE.getEnumerationValueType_IsMultiValued();
@@ -209,6 +237,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Literal Semantics</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS = eINSTANCE.getEnumerationValueType_LiteralSemantics();
@@ -217,14 +246,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Enumeration</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENUMERATION_VALUE_TYPE__BASE_ENUMERATION = eINSTANCE.getEnumerationValueType_Base_Enumeration();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl <em>Composite Datatype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl
+		 * <em>Composite Datatype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getCompositeDatatype()
 		 * @generated
@@ -235,6 +267,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Datatype Prototype</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE = eINSTANCE.getCompositeDatatype_DatatypePrototype();
@@ -243,6 +276,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAStringImpl <em>EA String</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAStringImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAString()
 		 * @generated
@@ -250,9 +284,11 @@ public interface DatatypesPackage extends EPackage {
 		EClass EA_STRING = eINSTANCE.getEAString();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EABooleanImpl <em>EA Boolean</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EABooleanImpl <em>EA Boolean</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EABooleanImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEABoolean()
 		 * @generated
@@ -263,6 +299,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl <em>EA Float</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAFloat()
 		 * @generated
@@ -273,6 +310,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EA_FLOAT__MIN = eINSTANCE.getEAFloat_Min();
@@ -281,14 +319,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EA_FLOAT__MAX = eINSTANCE.getEAFloat_Max();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl <em>EA Integer</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl <em>EA Integer</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAInteger()
 		 * @generated
@@ -299,6 +340,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Min</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EA_INTEGER__MIN = eINSTANCE.getEAInteger_Min();
@@ -307,14 +349,17 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Max</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EA_INTEGER__MAX = eINSTANCE.getEAInteger_Max();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl <em>Enumeration Literal</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl
+		 * <em>Enumeration Literal</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumerationLiteral()
 		 * @generated
@@ -322,9 +367,11 @@ public interface DatatypesPackage extends EPackage {
 		EClass ENUMERATION_LITERAL = eINSTANCE.getEnumerationLiteral();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl <em>Enumeration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl <em>Enumeration</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumeration()
 		 * @generated
@@ -335,6 +382,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Literal</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ENUMERATION__LITERAL = eINSTANCE.getEnumeration_Literal();
@@ -343,6 +391,7 @@ public interface DatatypesPackage extends EPackage {
 		 * The meta object literal for the '<em>javalang Float</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.Float
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getjavalangFloat()
 		 * @generated
@@ -355,6 +404,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "datatypes";
@@ -363,6 +413,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Infrastructure/Datatypes/1";
@@ -371,6 +422,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Datatypes";
@@ -379,6 +431,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DatatypesPackage eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl.init();
@@ -387,6 +440,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl <em>EA Datatype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEADatatype()
 	 * @generated
@@ -397,6 +451,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -406,6 +461,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -415,6 +471,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -424,6 +481,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -433,6 +491,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -442,6 +501,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -451,15 +511,18 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Datatype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EA_DATATYPE_FEATURE_COUNT = ElementsPackage.TRACEABLE_SPECIFICATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl <em>Rangeable Datatype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl <em>Rangeable Datatype</em>}
+	 * ' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableDatatypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getRangeableDatatype()
 	 * @generated
@@ -467,9 +530,11 @@ public interface DatatypesPackage extends EPackage {
 	int RANGEABLE_DATATYPE = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl <em>EA Datatype Prototype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl
+	 * <em>EA Datatype Prototype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEADatatypePrototype()
 	 * @generated
@@ -480,6 +545,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl <em>Value Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getValueType()
 	 * @generated
@@ -490,6 +556,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -499,6 +566,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -508,6 +576,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -517,6 +586,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -526,6 +596,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -535,6 +606,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -544,6 +616,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Datatype Prototype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -553,6 +626,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -562,6 +636,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -571,6 +646,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -580,6 +656,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -589,6 +666,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -598,6 +676,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -607,6 +686,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Semantics</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -616,6 +696,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Dimension</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -625,6 +706,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Unit</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -634,6 +716,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Value Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -643,6 +726,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -652,6 +736,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -661,6 +746,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -670,6 +756,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -679,6 +766,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -688,6 +776,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -697,15 +786,18 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Rangeable Datatype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RANGEABLE_DATATYPE_FEATURE_COUNT = EA_DATATYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl <em>Rangeable Value Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl
+	 * <em>Rangeable Value Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getRangeableValueType()
 	 * @generated
@@ -716,6 +808,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -725,6 +818,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -734,6 +828,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -743,6 +838,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -752,6 +848,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -761,6 +858,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -770,6 +868,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Semantics</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -779,6 +878,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Dimension</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -788,6 +888,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Unit</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -797,6 +898,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Accuracy</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -806,6 +908,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Resolution</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -815,6 +918,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Significant Digits</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -824,15 +928,18 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Rangeable Value Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RANGEABLE_VALUE_TYPE_FEATURE_COUNT = VALUE_TYPE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl <em>Enumeration Value Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl
+	 * <em>Enumeration Value Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumerationValueType()
 	 * @generated
@@ -843,6 +950,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -852,6 +960,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -861,6 +970,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -870,6 +980,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -879,6 +990,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -888,6 +1000,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -897,6 +1010,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Semantics</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -906,6 +1020,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Dimension</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -915,6 +1030,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Unit</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -924,6 +1040,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Multi Valued</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -933,6 +1050,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Literal Semantics</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -942,6 +1060,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Enumeration</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -951,15 +1070,18 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Enumeration Value Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ENUMERATION_VALUE_TYPE_FEATURE_COUNT = VALUE_TYPE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl <em>Composite Datatype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl <em>Composite Datatype</em>}
+	 * ' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getCompositeDatatype()
 	 * @generated
@@ -970,6 +1092,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -979,6 +1102,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -988,6 +1112,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -997,6 +1122,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1006,6 +1132,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1015,6 +1142,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1024,6 +1152,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Datatype Prototype</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1033,6 +1162,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Composite Datatype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1042,6 +1172,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAStringImpl <em>EA String</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAStringImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAString()
 	 * @generated
@@ -1052,6 +1183,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1061,6 +1193,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1070,6 +1203,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1079,6 +1213,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1088,6 +1223,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1097,6 +1233,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1106,6 +1243,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA String</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1115,6 +1253,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EABooleanImpl <em>EA Boolean</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EABooleanImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEABoolean()
 	 * @generated
@@ -1125,6 +1264,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1134,6 +1274,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1143,6 +1284,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1152,6 +1294,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1161,6 +1304,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1170,6 +1314,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1179,6 +1324,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Boolean</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1188,6 +1334,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl <em>EA Float</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAFloat()
 	 * @generated
@@ -1198,6 +1345,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1207,6 +1355,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1216,6 +1365,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1225,6 +1375,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1234,6 +1385,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1243,6 +1395,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1252,6 +1405,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Min</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1261,6 +1415,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Max</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1270,6 +1425,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Float</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1279,6 +1435,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl <em>EA Integer</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEAInteger()
 	 * @generated
@@ -1289,6 +1446,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1298,6 +1456,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1307,6 +1466,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1316,6 +1476,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1325,6 +1486,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1334,6 +1496,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1343,6 +1506,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Min</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1352,6 +1516,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Max</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1361,15 +1526,18 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Integer</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EA_INTEGER_FEATURE_COUNT = RANGEABLE_DATATYPE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl <em>Enumeration Literal</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl
+	 * <em>Enumeration Literal</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationLiteralImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumerationLiteral()
 	 * @generated
@@ -1380,6 +1548,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1389,6 +1558,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1398,6 +1568,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1407,6 +1578,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Enumeration Literal</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1416,6 +1588,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl <em>Enumeration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getEnumeration()
 	 * @generated
@@ -1426,6 +1599,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1435,6 +1609,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1444,6 +1619,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1453,6 +1629,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1462,6 +1639,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1471,6 +1649,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1480,6 +1659,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The feature id for the '<em><b>Literal</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1489,6 +1669,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The number of structural features of the '<em>Enumeration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1498,6 +1679,7 @@ public interface DatatypesPackage extends EPackage {
 	 * The meta object id for the '<em>javalang Float</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see java.lang.Float
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.DatatypesPackageImpl#getjavalangFloat()
 	 * @generated
@@ -1509,6 +1691,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype <em>EA Datatype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Datatype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype
 	 * @generated
@@ -1516,9 +1699,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getEADatatype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType <em>Base Data Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType
+	 * <em>Base Data Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Data Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType()
 	 * @see #getEADatatype()
@@ -1527,9 +1712,11 @@ public interface DatatypesPackage extends EPackage {
 	EReference getEADatatype_Base_DataType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype <em>EA Datatype Prototype</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype
+	 * <em>EA Datatype Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Datatype Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype
 	 * @generated
@@ -1537,9 +1724,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getEADatatypePrototype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType
+	 * <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType()
 	 * @see #getEADatatypePrototype()
@@ -1548,9 +1737,11 @@ public interface DatatypesPackage extends EPackage {
 	EReference getEADatatypePrototype_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property
+	 * <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property()
 	 * @see #getEADatatypePrototype()
@@ -1559,9 +1750,11 @@ public interface DatatypesPackage extends EPackage {
 	EReference getEADatatypePrototype_Base_Property();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter <em>Base Parameter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter
+	 * <em>Base Parameter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Parameter</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter()
 	 * @see #getEADatatypePrototype()
@@ -1573,6 +1766,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype <em>Composite Datatype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Composite Datatype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype
 	 * @generated
@@ -1580,9 +1774,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getCompositeDatatype();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype#getDatatypePrototype <em>Datatype Prototype</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype#getDatatypePrototype <em>Datatype Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Datatype Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype#getDatatypePrototype()
 	 * @see #getCompositeDatatype()
@@ -1594,6 +1790,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAString <em>EA String</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA String</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAString
 	 * @generated
@@ -1604,6 +1801,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean <em>EA Boolean</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Boolean</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean
 	 * @generated
@@ -1614,6 +1812,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat <em>EA Float</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Float</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat
 	 * @generated
@@ -1624,6 +1823,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMin <em>Min</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Min</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMin()
 	 * @see #getEAFloat()
@@ -1635,6 +1835,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMax <em>Max</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Max</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMax()
 	 * @see #getEAFloat()
@@ -1646,6 +1847,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger <em>EA Integer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Integer</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger
 	 * @generated
@@ -1656,6 +1858,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMin <em>Min</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Min</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMin()
 	 * @see #getEAInteger()
@@ -1667,6 +1870,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMax <em>Max</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Max</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMax()
 	 * @see #getEAInteger()
@@ -1678,15 +1882,18 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	DatatypesFactory getDatatypesFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral <em>Enumeration Literal</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral <em>Enumeration Literal</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Enumeration Literal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral
 	 * @generated
@@ -1697,6 +1904,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration <em>Enumeration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Enumeration</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration
 	 * @generated
@@ -1704,9 +1912,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getEnumeration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration#getLiteral <em>Literal</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration#getLiteral
+	 * <em>Literal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Literal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration#getLiteral()
 	 * @see #getEnumeration()
@@ -1715,9 +1925,11 @@ public interface DatatypesPackage extends EPackage {
 	EReference getEnumeration_Literal();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType <em>Enumeration Value Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType
+	 * <em>Enumeration Value Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Enumeration Value Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType
 	 * @generated
@@ -1725,9 +1937,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getEnumerationValueType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued <em>Is Multi Valued</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued
+	 * <em>Is Multi Valued</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Multi Valued</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued()
 	 * @see #getEnumerationValueType()
@@ -1736,9 +1950,11 @@ public interface DatatypesPackage extends EPackage {
 	EAttribute getEnumerationValueType_IsMultiValued();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getLiteralSemantics <em>Literal Semantics</em>}'.
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getLiteralSemantics <em>Literal Semantics</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Literal Semantics</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getLiteralSemantics()
 	 * @see #getEnumerationValueType()
@@ -1747,9 +1963,11 @@ public interface DatatypesPackage extends EPackage {
 	EAttribute getEnumerationValueType_LiteralSemantics();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration <em>Base Enumeration</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration <em>Base Enumeration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Enumeration</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration()
 	 * @see #getEnumerationValueType()
@@ -1761,6 +1979,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for data type '{@link java.lang.Float <em>javalang Float</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>javalang Float</em>'.
 	 * @see java.lang.Float
 	 * @model instanceClass="java.lang.Float"
@@ -1772,6 +1991,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype <em>Rangeable Datatype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Rangeable Datatype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype
 	 * @generated
@@ -1779,9 +1999,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getRangeableDatatype();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType <em>Rangeable Value Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType
+	 * <em>Rangeable Value Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Rangeable Value Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType
 	 * @generated
@@ -1789,9 +2011,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getRangeableValueType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy <em>Accuracy</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy
+	 * <em>Accuracy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Accuracy</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy()
 	 * @see #getRangeableValueType()
@@ -1800,9 +2024,11 @@ public interface DatatypesPackage extends EPackage {
 	EAttribute getRangeableValueType_Accuracy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution <em>Resolution</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution
+	 * <em>Resolution</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Resolution</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution()
 	 * @see #getRangeableValueType()
@@ -1811,9 +2037,11 @@ public interface DatatypesPackage extends EPackage {
 	EAttribute getRangeableValueType_Resolution();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits <em>Significant Digits</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits
+	 * <em>Significant Digits</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Significant Digits</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits()
 	 * @see #getRangeableValueType()
@@ -1825,6 +2053,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType <em>Value Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Value Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType
 	 * @generated
@@ -1832,9 +2061,11 @@ public interface DatatypesPackage extends EPackage {
 	EClass getValueType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics <em>Semantics</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics
+	 * <em>Semantics</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Semantics</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics()
 	 * @see #getValueType()
@@ -1843,9 +2074,11 @@ public interface DatatypesPackage extends EPackage {
 	EAttribute getValueType_Semantics();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension <em>Dimension</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension
+	 * <em>Dimension</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Dimension</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension()
 	 * @see #getValueType()
@@ -1857,6 +2090,7 @@ public interface DatatypesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getUnit <em>Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Unit</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getUnit()
 	 * @see #getValueType()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EABoolean.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EABoolean.java
index c594d123875..4fafc4eb1a7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EABoolean.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EABoolean.java
@@ -20,8 +20,8 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Boolean</b></em>'.
  * <!-- end-user-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEABoolean()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatype.java
index 6ac9e85606e..c644cce1e28 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatype.java
@@ -23,40 +23,47 @@ import org.eclipse.uml2.uml.DataType;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Datatype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The EADatatype is a metaclass, which signifies a type whose instances are identified only by their value. The EADatatype metaclass represents the description of the value set for some variable, parameter etc. without a description of how these possible values are represented on implementation level. The implementation representation is defined on implementation level by the AUTOSAR concept PrimitiveTypeWithSemantics, and the implemented datatype shall be associated with a Realization relationship. The realizing datatype must match the EADatatype regarding range, resolution, unit, and dimension.
+ * The EADatatype is a metaclass, which signifies a type whose instances are identified only by their value. The EADatatype metaclass represents the
+ * description of the value set for some variable, parameter etc. without a description of how these possible values are represented on implementation
+ * level. The implementation representation is defined on implementation level by the AUTOSAR concept PrimitiveTypeWithSemantics, and the implemented
+ * datatype shall be associated with a Realization relationship. The realizing datatype must match the EADatatype regarding range, resolution, unit,
+ * and dimension.
  * 
  * Semantics:
- * EADatatype metaclass is a special kind of classifier, similar to a class. It differs from the class in that instances of a data type are identified only by their value.
+ * EADatatype metaclass is a special kind of classifier, similar to a class. It differs from the class in that instances of a data type are identified
+ * only by their value.
  * 
  * Constraints:
- * [1] In the case of an AR implementation, an EADatatype is realized generally by PrimitiveTypeWithSemantics, which has to be consistent w.r.t. range, resolution, etc.
+ * [1] In the case of an AR implementation, an EADatatype is realized generally by PrimitiveTypeWithSemantics, which has to be consistent w.r.t.
+ * range, resolution, etc.
  * 
  * Notation:
  * The EADatatype is denoted using the rectangle symbol with keyword «Datatype».
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType <em>Base Data Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType <em>Base Data Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatype()
  * @model abstract="true"
  * @generated
  */
 public interface EADatatype extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Data Type</em>' reference.
 	 * @see #setBase_DataType(DataType)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatype_Base_DataType()
@@ -66,10 +73,13 @@ public interface EADatatype extends TraceableSpecification {
 	DataType getBase_DataType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType <em>Base Data Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype#getBase_DataType <em>Base Data Type</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Data Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Data Type</em>' reference.
 	 * @see #getBase_DataType()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatypePrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatypePrototype.java
index 6dbe85c64eb..4285303c4ee 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatypePrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EADatatypePrototype.java
@@ -24,38 +24,41 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Datatype Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The EADatatypePrototype represents a typed variable. An example is a composite datatype ColorValue with parts R, G, and B of type integer. ColorValue would contain three prototypes only to be able to reference the record parts by name. The EADatatypePrototype is also used to represent argument and return values of operations or to represent a parameter.
+ * The EADatatypePrototype represents a typed variable. An example is a composite datatype ColorValue with parts R, G, and B of type integer.
+ * ColorValue would contain three prototypes only to be able to reference the record parts by name. The EADatatypePrototype is also used to represent
+ * argument and return values of operations or to represent a parameter.
  * 
  * Semantics:
  * The EADatatypePrototype represents a typed variable. It acts as an occurrence of a datatype.
  * 
  * Extension: Property
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter <em>Base Parameter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter <em>Base Parameter</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatypePrototype()
  * @model
  * @generated
  */
 public interface EADatatypePrototype extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Parameter</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Parameter</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Parameter</em>' reference.
 	 * @see #setBase_Parameter(Parameter)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatypePrototype_Base_Parameter()
@@ -68,10 +71,10 @@ public interface EADatatypePrototype extends EAElement {
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatypePrototype_Base_Property()
@@ -84,10 +87,10 @@ public interface EADatatypePrototype extends EAElement {
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(EADatatype)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEADatatypePrototype_Type()
@@ -97,20 +100,26 @@ public interface EADatatypePrototype extends EAElement {
 	EADatatype getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter <em>Base Parameter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Parameter
+	 * <em>Base Parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Parameter</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Parameter</em>' reference.
 	 * @see #getBase_Parameter()
 	 * @generated
 	 */
 	void setBase_Parameter(Parameter value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getBase_Property <em>Base Property</em>}
+	 * ' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
@@ -120,7 +129,9 @@ public interface EADatatypePrototype extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Type</em>' reference.
 	 * @see #getType()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAFloat.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAFloat.java
index 01f5d104177..aa2b4d97589 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAFloat.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAFloat.java
@@ -20,28 +20,29 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Float</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMin <em>Min</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMax <em>Max</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAFloat()
  * @model
  * @generated
  */
 public interface EAFloat extends RangeableDatatype {
+
 	/**
 	 * Returns the value of the '<em><b>Max</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Max</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Max</em>' attribute.
 	 * @see #setMax(Float)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAFloat_Max()
@@ -54,10 +55,10 @@ public interface EAFloat extends RangeableDatatype {
 	 * Returns the value of the '<em><b>Min</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Min</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Min</em>' attribute.
 	 * @see #setMin(Float)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAFloat_Min()
@@ -70,7 +71,9 @@ public interface EAFloat extends RangeableDatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMax <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Max</em>' attribute.
 	 * @see #getMax()
 	 * @generated
 	 */
@@ -80,7 +83,9 @@ public interface EAFloat extends RangeableDatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat#getMin <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Min</em>' attribute.
 	 * @see #getMin()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAInteger.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAInteger.java
index d5c3e6fcb15..bb5afbdd5bc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAInteger.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAInteger.java
@@ -20,28 +20,29 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Integer</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMin <em>Min</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMax <em>Max</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAInteger()
  * @model
  * @generated
  */
 public interface EAInteger extends RangeableDatatype {
+
 	/**
 	 * Returns the value of the '<em><b>Max</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Max</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Max</em>' attribute.
 	 * @see #setMax(int)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAInteger_Max()
@@ -54,10 +55,10 @@ public interface EAInteger extends RangeableDatatype {
 	 * Returns the value of the '<em><b>Min</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Min</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Min</em>' attribute.
 	 * @see #setMin(int)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAInteger_Min()
@@ -70,7 +71,9 @@ public interface EAInteger extends RangeableDatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMax <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Max</em>' attribute.
 	 * @see #getMax()
 	 * @generated
 	 */
@@ -80,7 +83,9 @@ public interface EAInteger extends RangeableDatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger#getMin <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Min</em>' attribute.
 	 * @see #getMin()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAString.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAString.java
index 26ddd6c3fd8..1a91bc54abd 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAString.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EAString.java
@@ -20,8 +20,8 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA String</b></em>'.
  * <!-- end-user-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEAString()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/Enumeration.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/Enumeration.java
index 29b37a33774..d7d3e93cc12 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/Enumeration.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/Enumeration.java
@@ -21,28 +21,29 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Enumeration</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration#getLiteral <em>Literal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration#getLiteral <em>Literal</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumeration()

  * @model

  * @generated

  */

 public interface Enumeration extends EADatatype {

+

 	/**

 	 * Returns the value of the '<em><b>Literal</b></em>' containment reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Literal</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Literal</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Literal</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumeration_Literal()

 	 * @model containment="true" lower="2" ordered="false"

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationLiteral.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationLiteral.java
index 9a14a0d9675..a12d66e24e6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationLiteral.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationLiteral.java
@@ -22,8 +22,8 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Enumeration Literal</b></em>'.

  * <!-- end-user-doc -->

- *

- *

+ * 

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumerationLiteral()

  * @model

  * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationValueType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationValueType.java
index 1afdc6a699b..340da9d8681 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationValueType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/EnumerationValueType.java
@@ -22,12 +22,14 @@ import org.eclipse.uml2.uml.Enumeration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Enumeration Value Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The EnumerationValueType is a specific ValueType applicable for Enumerations. It provides the possibility to describe semantics of the baseEnumeration's literals and the information, if multiple values of the baseEnumeration may be selected or not.
+ * The EnumerationValueType is a specific ValueType applicable for Enumerations. It provides the possibility to describe semantics of the
+ * baseEnumeration's literals and the information, if multiple values of the baseEnumeration may be selected or not.
  * 
  * Semantics:
- * The EnumerationValueType adds the ability to describe semantics of the baseEnumeration's literals and if multiple values of the baseEnumeration may be selected or not.
+ * The EnumerationValueType adds the ability to describe semantics of the baseEnumeration's literals and if multiple values of the baseEnumeration may
+ * be selected or not.
  * 
  * 
  * Notation:
@@ -35,30 +37,31 @@ import org.eclipse.uml2.uml.Enumeration;
  * 
  * Extension: UML Enumeration
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued <em>Is Multi Valued</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getLiteralSemantics <em>Literal Semantics</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration <em>Base Enumeration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued <em>Is Multi Valued</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getLiteralSemantics <em>Literal Semantics</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration <em>Base Enumeration</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumerationValueType()
  * @model
  * @generated
  */
 public interface EnumerationValueType extends ValueType {
+
 	/**
 	 * Returns the value of the '<em><b>Literal Semantics</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Literal Semantics</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Literal Semantics</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Literal Semantics</em>' attribute list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumerationValueType_LiteralSemantics()
 	 * @model unique="false" dataType="org.eclipse.uml2.types.String" lower="2"
@@ -70,10 +73,10 @@ public interface EnumerationValueType extends ValueType {
 	 * Returns the value of the '<em><b>Base Enumeration</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Enumeration</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Enumeration</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Enumeration</em>' reference.
 	 * @see #setBase_Enumeration(Enumeration)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumerationValueType_Base_Enumeration()
@@ -83,10 +86,13 @@ public interface EnumerationValueType extends ValueType {
 	Enumeration getBase_Enumeration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration <em>Base Enumeration</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#getBase_Enumeration
+	 * <em>Base Enumeration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Enumeration</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Enumeration</em>' reference.
 	 * @see #getBase_Enumeration()
 	 * @generated
 	 */
@@ -96,10 +102,10 @@ public interface EnumerationValueType extends ValueType {
 	 * Returns the value of the '<em><b>Is Multi Valued</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Is Multi Valued</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Is Multi Valued</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Is Multi Valued</em>' attribute.
 	 * @see #setIsMultiValued(boolean)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getEnumerationValueType_IsMultiValued()
@@ -109,10 +115,13 @@ public interface EnumerationValueType extends ValueType {
 	boolean isIsMultiValued();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued <em>Is Multi Valued</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType#isIsMultiValued
+	 * <em>Is Multi Valued</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Multi Valued</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Multi Valued</em>' attribute.
 	 * @see #isIsMultiValued()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableDatatype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableDatatype.java
index 1cf6b311fe1..dc241ab49ae 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableDatatype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableDatatype.java
@@ -21,9 +21,10 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Rangeable Datatype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The stereotype RangeableDatatype reflects numeric datatypes that may have a range (between a minimal and a maximal value). An example for a RangeableDatatype is the Celsius temperature scale with minValue = -273.15.
+ * The stereotype RangeableDatatype reflects numeric datatypes that may have a range (between a minimal and a maximal value). An example for a
+ * RangeableDatatype is the Celsius temperature scale with minValue = -273.15.
  * 
  * Semantics:
  * The stereotype RangeableDatatype reflects numeric datatypes that may have a range (between a minimal and a maximal value).
@@ -31,8 +32,8 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * 
  * Extension: UML Datatype
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getRangeableDatatype()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableValueType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableValueType.java
index 34ba0435d32..ce2212b883a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableValueType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/RangeableValueType.java
@@ -20,9 +20,10 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Rangeable Value Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The RangeableValueType is a specific ValueType applicable for RangeableDatatypes. It provides the possibility to describe the accuracy, resolution, and the significant digits of the baseRangeable datatypes.
+ * The RangeableValueType is a specific ValueType applicable for RangeableDatatypes. It provides the possibility to describe the accuracy, resolution,
+ * and the significant digits of the baseRangeable datatypes.
  * 
  * Semantics:
  * The RangeableValueType adds the ability to describe the accuracy, resolution, and the significant digits of the baseRangeable datatype.
@@ -32,29 +33,30 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * 
  * Extension: UML Datatype
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution <em>Resolution</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits <em>Significant Digits</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy <em>Accuracy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits <em>Significant Digits</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getRangeableValueType()
  * @model
  * @generated
  */
 public interface RangeableValueType extends ValueType {
+
 	/**
 	 * Returns the value of the '<em><b>Accuracy</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Accuracy</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Accuracy</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Accuracy</em>' attribute.
 	 * @see #setAccuracy(Float)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getRangeableValueType_Accuracy()
@@ -67,10 +69,10 @@ public interface RangeableValueType extends ValueType {
 	 * Returns the value of the '<em><b>Resolution</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Resolution</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Resolution</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Resolution</em>' attribute.
 	 * @see #setResolution(Float)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getRangeableValueType_Resolution()
@@ -83,10 +85,10 @@ public interface RangeableValueType extends ValueType {
 	 * Returns the value of the '<em><b>Significant Digits</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Significant Digits</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Significant Digits</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Significant Digits</em>' attribute.
 	 * @see #setSignificantDigits(int)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getRangeableValueType_SignificantDigits()
@@ -96,30 +98,39 @@ public interface RangeableValueType extends ValueType {
 	int getSignificantDigits();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy <em>Accuracy</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getAccuracy <em>Accuracy</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accuracy</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Accuracy</em>' attribute.
 	 * @see #getAccuracy()
 	 * @generated
 	 */
 	void setAccuracy(Float value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution <em>Resolution</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getResolution <em>Resolution</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resolution</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Resolution</em>' attribute.
 	 * @see #getResolution()
 	 * @generated
 	 */
 	void setResolution(Float value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits <em>Significant Digits</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType#getSignificantDigits
+	 * <em>Significant Digits</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Significant Digits</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Significant Digits</em>' attribute.
 	 * @see #getSignificantDigits()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/ValueType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/ValueType.java
index ecf7afe2a95..5597c08f9a3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/ValueType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/ValueType.java
@@ -20,40 +20,55 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Value Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * From SysML:
- * A ValueType defines types of values that may be used to express information about a system, but cannot be identified as the target of any reference. Since a value cannot be identified except by means of the value itself, each such value within a model is independent of any other, unless other forms of constraints are imposed. Value types may be used to type properties, operation parameters, or potentially other elements within SysML. SysML defines ValueType as a stereotype of UML DataType to establish a more neutral term for system values that may never be given a concrete data representation. For example, the SysML "Real" ValueType expresses the mathematical concept of a real number, but does not impose any restrictions on the precision or scale of a fixed or floating-point representation that expresses this concept. More specific value types can define the concrete data representations that a digital computer can process, such as conventional Float, Integer, or String types. SysML ValueType adds an ability to carry a unit of measure or dimension associated with the value. A dimension is a kind of quantity that may be stated in terms of defined units, but does not restrict the selection of a unit to state the value. A unit is a particular value in terms of which a quantity of the same dimension may be expressed. A SysML ValueType may define its own properties and/or operations, just as for a UML DataType.
+ * A ValueType defines types of values that may be used to express information about a system, but cannot be identified as the target of any
+ * reference. Since a value cannot be identified except by means of the value itself, each such value within a model is independent of any other,
+ * unless other forms of constraints are imposed. Value types may be used to type properties, operation parameters, or potentially other elements
+ * within SysML. SysML defines ValueType as a stereotype of UML DataType to establish a more neutral term for system values that may never be given a
+ * concrete data representation. For example, the SysML "Real" ValueType expresses the mathematical concept of a real number, but does not impose any
+ * restrictions on the precision or scale of a fixed or floating-point representation that expresses this concept. More specific value types can
+ * define the concrete data representations that a digital computer can process, such as conventional Float, Integer, or String types. SysML ValueType
+ * adds an ability to carry a unit of measure or dimension associated with the value. A dimension is a kind of quantity that may be stated in terms of
+ * defined units, but does not restrict the selection of a unit to state the value. A unit is a particular value in terms of which a quantity of the
+ * same dimension may be expressed. A SysML ValueType may define its own properties and/or operations, just as for a UML DataType.
  * 
  * Semantics:
- * The abstract ValueType defines types of values that may be used to express information about a system. The ValueType adds an ability to carry a description, a dimension associated with the value, and a unit of measure. A dimension is a kind of quantity that may be stated in terms of defined units, but does not restrict the selection of a unit to state the value. A unit is a particular value in terms of which a quantity of the same dimension may be expressed.
- * Logical and physical datatypes cannot be distinguished on the type. The context (e.g., EnvironmentModel or FunctionalAnalysisArchitecture) decides if a speed datatype is physical or logical. On AnalysisLevel or DesignLevel, physical datatypes shall not be interpreted in the implementation sense as this would include int32, coding formula, etc.
+ * The abstract ValueType defines types of values that may be used to express information about a system. The ValueType adds an ability to carry a
+ * description, a dimension associated with the value, and a unit of measure. A dimension is a kind of quantity that may be stated in terms of defined
+ * units, but does not restrict the selection of a unit to state the value. A unit is a particular value in terms of which a quantity of the same
+ * dimension may be expressed.
+ * Logical and physical datatypes cannot be distinguished on the type. The context (e.g., EnvironmentModel or FunctionalAnalysisArchitecture) decides
+ * if a speed datatype is physical or logical. On AnalysisLevel or DesignLevel, physical datatypes shall not be interpreted in the implementation
+ * sense as this would include int32, coding formula, etc.
  * 
  * Extension: UML Datatype
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics <em>Semantics</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension <em>Dimension</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getUnit <em>Unit</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics <em>Semantics</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension <em>Dimension</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getUnit <em>Unit</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getValueType()
  * @model abstract="true"
  * @generated
  */
 public interface ValueType extends EADatatype {
+
 	/**
 	 * Returns the value of the '<em><b>Semantics</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Semantics</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Semantics</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Semantics</em>' attribute.
 	 * @see #setSemantics(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getValueType_Semantics()
@@ -66,7 +81,9 @@ public interface ValueType extends EADatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getSemantics <em>Semantics</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Semantics</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Semantics</em>' attribute.
 	 * @see #getSemantics()
 	 * @generated
 	 */
@@ -76,10 +93,10 @@ public interface ValueType extends EADatatype {
 	 * Returns the value of the '<em><b>Dimension</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dimension</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dimension</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dimension</em>' attribute.
 	 * @see #setDimension(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getValueType_Dimension()
@@ -92,10 +109,10 @@ public interface ValueType extends EADatatype {
 	 * Returns the value of the '<em><b>Unit</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Unit</em>' attribute.
 	 * @see #setUnit(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#getValueType_Unit()
@@ -108,7 +125,9 @@ public interface ValueType extends EADatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getDimension <em>Dimension</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dimension</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Dimension</em>' attribute.
 	 * @see #getDimension()
 	 * @generated
 	 */
@@ -118,7 +137,9 @@ public interface ValueType extends EADatatype {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType#getUnit <em>Unit</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unit</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Unit</em>' attribute.
 	 * @see #getUnit()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/CompositeDatatypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/CompositeDatatypeImpl.java
index be8319c3c15..6bc283052c3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/CompositeDatatypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/CompositeDatatypeImpl.java
@@ -32,17 +32,19 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl#getDatatypePrototype <em>Datatype Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.CompositeDatatypeImpl#getDatatypePrototype <em>Datatype Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDatatype {
+
 	/**
 	 * The cached value of the '{@link #getDatatypePrototype() <em>Datatype Prototype</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDatatypePrototype()
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CompositeDatatypeImpl() {
@@ -61,13 +64,14 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
-				return getDatatypePrototype();
+		switch(featureID) {
+		case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
+			return getDatatypePrototype();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -75,13 +79,14 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
-				return datatypePrototype != null && !datatypePrototype.isEmpty();
+		switch(featureID) {
+		case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
+			return datatypePrototype != null && !datatypePrototype.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -89,16 +94,17 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
-				getDatatypePrototype().clear();
-				getDatatypePrototype().addAll((Collection<? extends EADatatypePrototype>)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
+			getDatatypePrototype().clear();
+			getDatatypePrototype().addAll((Collection<? extends EADatatypePrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -106,6 +112,7 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,14 +123,15 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
-				getDatatypePrototype().clear();
-				return;
+		switch(featureID) {
+		case DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE:
+			getDatatypePrototype().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -131,10 +139,11 @@ public class CompositeDatatypeImpl extends EADatatypeImpl implements CompositeDa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EADatatypePrototype> getDatatypePrototype() {
-		if (datatypePrototype == null) {
+		if(datatypePrototype == null) {
 			datatypePrototype = new EObjectResolvingEList<EADatatypePrototype>(EADatatypePrototype.class, this, DatatypesPackage.COMPOSITE_DATATYPE__DATATYPE_PROTOTYPE);
 		}
 		return datatypePrototype;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesFactoryImpl.java
index 817126201a6..be682e08f29 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.infrastructure.datatypes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesFactory;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage;
@@ -39,12 +40,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -57,16 +61,16 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DatatypesFactory init() {
 		try {
 			DatatypesFactory theDatatypesFactory = (DatatypesFactory)EPackage.Registry.INSTANCE.getEFactory(DatatypesPackage.eNS_URI);
-			if (theDatatypesFactory != null) {
+			if(theDatatypesFactory != null) {
 				return theDatatypesFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DatatypesFactoryImpl();
@@ -76,6 +80,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesFactoryImpl() {
@@ -85,6 +90,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertjavalangFloatToString(EDataType eDataType, Object instanceValue) {
@@ -94,21 +100,23 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case DatatypesPackage.JAVALANG_FLOAT:
-				return convertjavalangFloatToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DatatypesPackage.JAVALANG_FLOAT:
+			return convertjavalangFloatToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatypePrototype createEADatatypePrototype() {
@@ -119,29 +127,41 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE: return createEADatatypePrototype();
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE: return createRangeableValueType();
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE: return createEnumerationValueType();
-			case DatatypesPackage.COMPOSITE_DATATYPE: return createCompositeDatatype();
-			case DatatypesPackage.EA_STRING: return createEAString();
-			case DatatypesPackage.EA_BOOLEAN: return createEABoolean();
-			case DatatypesPackage.EA_FLOAT: return createEAFloat();
-			case DatatypesPackage.EA_INTEGER: return createEAInteger();
-			case DatatypesPackage.ENUMERATION_LITERAL: return createEnumerationLiteral();
-			case DatatypesPackage.ENUMERATION: return createEnumeration();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE:
+			return createEADatatypePrototype();
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE:
+			return createRangeableValueType();
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE:
+			return createEnumerationValueType();
+		case DatatypesPackage.COMPOSITE_DATATYPE:
+			return createCompositeDatatype();
+		case DatatypesPackage.EA_STRING:
+			return createEAString();
+		case DatatypesPackage.EA_BOOLEAN:
+			return createEABoolean();
+		case DatatypesPackage.EA_FLOAT:
+			return createEAFloat();
+		case DatatypesPackage.EA_INTEGER:
+			return createEAInteger();
+		case DatatypesPackage.ENUMERATION_LITERAL:
+			return createEnumerationLiteral();
+		case DatatypesPackage.ENUMERATION:
+			return createEnumeration();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CompositeDatatype createCompositeDatatype() {
@@ -152,6 +172,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAString createEAString() {
@@ -162,6 +183,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EABoolean createEABoolean() {
@@ -172,6 +194,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAFloat createEAFloat() {
@@ -182,6 +205,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAInteger createEAInteger() {
@@ -192,6 +216,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnumerationLiteral createEnumerationLiteral() {
@@ -202,6 +227,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Enumeration createEnumeration() {
@@ -212,6 +238,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EnumerationValueType createEnumerationValueType() {
@@ -222,21 +249,23 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case DatatypesPackage.JAVALANG_FLOAT:
-				return createjavalangFloatFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DatatypesPackage.JAVALANG_FLOAT:
+			return createjavalangFloatFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float createjavalangFloatFromString(EDataType eDataType, String initialValue) {
@@ -246,6 +275,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RangeableValueType createRangeableValueType() {
@@ -256,6 +286,7 @@ public class DatatypesFactoryImpl extends EFactoryImpl implements DatatypesFacto
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesPackage getDatatypesPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesPackageImpl.java
index f22b57be200..119e1078194 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/DatatypesPackageImpl.java
@@ -99,6 +99,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPackage {
@@ -106,6 +107,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaDatatypeEClass = null;
@@ -113,6 +115,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rangeableDatatypeEClass = null;
@@ -120,6 +123,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaDatatypePrototypeEClass = null;
@@ -127,6 +131,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass valueTypeEClass = null;
@@ -134,6 +139,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rangeableValueTypeEClass = null;
@@ -141,6 +147,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass enumerationValueTypeEClass = null;
@@ -148,6 +155,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass compositeDatatypeEClass = null;
@@ -155,6 +163,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaStringEClass = null;
@@ -162,6 +171,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaBooleanEClass = null;
@@ -169,6 +179,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaFloatEClass = null;
@@ -176,6 +187,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaIntegerEClass = null;
@@ -183,6 +195,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass enumerationLiteralEClass = null;
@@ -190,6 +203,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass enumerationEClass = null;
@@ -197,6 +211,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType javalangFloatEDataType = null;
@@ -204,6 +219,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -211,16 +227,18 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * 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 DatatypesPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link DatatypesPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static DatatypesPackage init() {
-		if (isInited) return (DatatypesPackage)EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI);
+		if(isInited)
+			return (DatatypesPackage)EPackage.Registry.INSTANCE.getEPackage(DatatypesPackage.eNS_URI);
 
 		// Obtain or create and register package
 		DatatypesPackageImpl theDatatypesPackage = (DatatypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DatatypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DatatypesPackageImpl());
@@ -322,7 +340,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 		// Mark meta-data to indicate it can't be changed
 		theDatatypesPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DatatypesPackage.eNS_URI, theDatatypesPackage);
 		return theDatatypesPackage;
@@ -331,6 +349,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEADatatype() {
@@ -340,6 +359,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEADatatype_Base_DataType() {
@@ -349,6 +369,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEADatatypePrototype() {
@@ -358,6 +379,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEADatatypePrototype_Type() {
@@ -367,6 +389,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEADatatypePrototype_Base_Property() {
@@ -376,6 +399,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEADatatypePrototype_Base_Parameter() {
@@ -385,6 +409,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -392,19 +417,19 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage#eNS_URI
 	 * @see #init()
@@ -415,14 +440,16 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -478,6 +505,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCompositeDatatype() {
@@ -487,6 +515,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCompositeDatatype_DatatypePrototype() {
@@ -496,6 +525,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAString() {
@@ -505,6 +535,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEABoolean() {
@@ -514,6 +545,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAFloat() {
@@ -523,6 +555,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEAFloat_Min() {
@@ -532,6 +565,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEAFloat_Max() {
@@ -541,6 +575,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAInteger() {
@@ -550,6 +585,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEAInteger_Min() {
@@ -559,6 +595,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEAInteger_Max() {
@@ -568,6 +605,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesFactory getDatatypesFactory() {
@@ -577,6 +615,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEnumerationLiteral() {
@@ -586,6 +625,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEnumeration() {
@@ -595,6 +635,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnumeration_Literal() {
@@ -604,6 +645,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEnumerationValueType() {
@@ -613,6 +655,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEnumerationValueType_IsMultiValued() {
@@ -622,6 +665,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEnumerationValueType_LiteralSemantics() {
@@ -631,6 +675,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEnumerationValueType_Base_Enumeration() {
@@ -640,6 +685,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getjavalangFloat() {
@@ -649,6 +695,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRangeableDatatype() {
@@ -658,6 +705,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRangeableValueType() {
@@ -667,6 +715,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRangeableValueType_Accuracy() {
@@ -676,6 +725,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRangeableValueType_Resolution() {
@@ -685,6 +735,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRangeableValueType_SignificantDigits() {
@@ -694,6 +745,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getValueType() {
@@ -703,6 +755,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getValueType_Semantics() {
@@ -712,6 +765,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getValueType_Dimension() {
@@ -721,6 +775,7 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getValueType_Unit() {
@@ -728,14 +783,16 @@ public class DatatypesPackageImpl extends EPackageImpl implements DatatypesPacka
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EABooleanImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EABooleanImpl.java
index 7fb417b6771..966c3eaa416 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EABooleanImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EABooleanImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class EABooleanImpl extends EADatatypeImpl implements EABoolean {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EABooleanImpl() {
@@ -42,6 +44,7 @@ public class EABooleanImpl extends EADatatypeImpl implements EABoolean {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypeImpl.java
index 2a23b6d12ec..fcfdbdc1a2a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypeImpl.java
@@ -32,17 +32,19 @@ import org.eclipse.uml2.uml.DataType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl#getBase_DataType <em>Base Data Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypeImpl#getBase_DataType <em>Base Data Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class EADatatypeImpl extends TraceableSpecificationImpl implements EADatatype {
+
 	/**
 	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_DataType()
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EADatatypeImpl() {
@@ -61,6 +64,7 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DataType basicGetBase_DataType() {
@@ -70,14 +74,16 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
-				if (resolve) return getBase_DataType();
-				return basicGetBase_DataType();
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
+			if(resolve)
+				return getBase_DataType();
+			return basicGetBase_DataType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -85,13 +91,14 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
-				return base_DataType != null;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
+			return base_DataType != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -99,14 +106,15 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
-				setBase_DataType((DataType)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
+			setBase_DataType((DataType)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -114,6 +122,7 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,14 +133,15 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
-				setBase_DataType((DataType)null);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE:
+			setBase_DataType((DataType)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -139,14 +149,15 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DataType getBase_DataType() {
-		if (base_DataType != null && base_DataType.eIsProxy()) {
+		if(base_DataType != null && base_DataType.eIsProxy()) {
 			InternalEObject oldBase_DataType = (InternalEObject)base_DataType;
 			base_DataType = (DataType)eResolveProxy(oldBase_DataType);
-			if (base_DataType != oldBase_DataType) {
-				if (eNotificationRequired())
+			if(base_DataType != oldBase_DataType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));
 			}
 		}
@@ -156,12 +167,13 @@ public abstract class EADatatypeImpl extends TraceableSpecificationImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_DataType(DataType newBase_DataType) {
 		DataType oldBase_DataType = base_DataType;
 		base_DataType = newBase_DataType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_DATATYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypePrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypePrototypeImpl.java
index e4f99247705..e9bfe4080ff 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypePrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EADatatypePrototypeImpl.java
@@ -34,19 +34,21 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getBase_Parameter <em>Base Parameter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EADatatypePrototypeImpl#getBase_Parameter <em>Base Parameter</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatypePrototype {
+
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -57,6 +59,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Parameter()
 	 * @generated
 	 * @ordered
@@ -76,6 +80,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EADatatypePrototypeImpl() {
@@ -85,6 +90,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Parameter basicGetBase_Parameter() {
@@ -94,6 +100,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -103,6 +110,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype basicGetType() {
@@ -112,20 +120,24 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
-				if (resolve) return getBase_Parameter();
-				return basicGetBase_Parameter();
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
+			if(resolve)
+				return getBase_Parameter();
+			return basicGetBase_Parameter();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -133,17 +145,18 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
-				return type != null;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
-				return base_Property != null;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
-				return base_Parameter != null;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
+			return type != null;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
+			return base_Property != null;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
+			return base_Parameter != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -151,20 +164,21 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
-				setType((EADatatype)newValue);
-				return;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
-				setBase_Parameter((Parameter)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
+			setType((EADatatype)newValue);
+			return;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
+			setBase_Parameter((Parameter)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -172,6 +186,7 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,20 +197,21 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
-				setType((EADatatype)null);
-				return;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
-				setBase_Parameter((Parameter)null);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE:
+			setType((EADatatype)null);
+			return;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER:
+			setBase_Parameter((Parameter)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -203,14 +219,15 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Parameter getBase_Parameter() {
-		if (base_Parameter != null && base_Parameter.eIsProxy()) {
+		if(base_Parameter != null && base_Parameter.eIsProxy()) {
 			InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;
 			base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);
-			if (base_Parameter != oldBase_Parameter) {
-				if (eNotificationRequired())
+			if(base_Parameter != oldBase_Parameter) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));
 			}
 		}
@@ -220,14 +237,15 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -237,14 +255,15 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype getType() {
-		if (type != null && type.eIsProxy()) {
+		if(type != null && type.eIsProxy()) {
 			InternalEObject oldType = (InternalEObject)type;
 			type = (EADatatype)eResolveProxy(oldType);
-			if (type != oldType) {
-				if (eNotificationRequired())
+			if(type != oldType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE, oldType, type));
 			}
 		}
@@ -254,36 +273,39 @@ public class EADatatypePrototypeImpl extends EAElementImpl implements EADatatype
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Parameter(Parameter newBase_Parameter) {
 		Parameter oldBase_Parameter = base_Parameter;
 		base_Parameter = newBase_Parameter;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_DATATYPE_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(EADatatype newType) {
 		EADatatype oldType = type;
 		type = newType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_DATATYPE_PROTOTYPE__TYPE, oldType, type));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAFloatImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAFloatImpl.java
index 65b5c7a1adb..13791b73ea7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAFloatImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAFloatImpl.java
@@ -29,18 +29,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl#getMin <em>Min</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAFloatImpl#getMax <em>Max</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
+
 	/**
 	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -61,6 +64,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -71,6 +75,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -80,6 +85,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EAFloatImpl() {
@@ -89,15 +95,16 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.EA_FLOAT__MIN:
-				return getMin();
-			case DatatypesPackage.EA_FLOAT__MAX:
-				return getMax();
+		switch(featureID) {
+		case DatatypesPackage.EA_FLOAT__MIN:
+			return getMin();
+		case DatatypesPackage.EA_FLOAT__MAX:
+			return getMax();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -105,15 +112,16 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_FLOAT__MIN:
-				return MIN_EDEFAULT == null ? min != null : !MIN_EDEFAULT.equals(min);
-			case DatatypesPackage.EA_FLOAT__MAX:
-				return MAX_EDEFAULT == null ? max != null : !MAX_EDEFAULT.equals(max);
+		switch(featureID) {
+		case DatatypesPackage.EA_FLOAT__MIN:
+			return MIN_EDEFAULT == null ? min != null : !MIN_EDEFAULT.equals(min);
+		case DatatypesPackage.EA_FLOAT__MAX:
+			return MAX_EDEFAULT == null ? max != null : !MAX_EDEFAULT.equals(max);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -121,17 +129,18 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.EA_FLOAT__MIN:
-				setMin((Float)newValue);
-				return;
-			case DatatypesPackage.EA_FLOAT__MAX:
-				setMax((Float)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_FLOAT__MIN:
+			setMin((Float)newValue);
+			return;
+		case DatatypesPackage.EA_FLOAT__MAX:
+			setMax((Float)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -139,6 +148,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,17 +159,18 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_FLOAT__MIN:
-				setMin(MIN_EDEFAULT);
-				return;
-			case DatatypesPackage.EA_FLOAT__MAX:
-				setMax(MAX_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_FLOAT__MIN:
+			setMin(MIN_EDEFAULT);
+			return;
+		case DatatypesPackage.EA_FLOAT__MAX:
+			setMax(MAX_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -167,6 +178,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getMax() {
@@ -176,6 +188,7 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getMin() {
@@ -185,35 +198,39 @@ public class EAFloatImpl extends RangeableDatatypeImpl implements EAFloat {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMax(Float newMax) {
 		Float oldMax = max;
 		max = newMax;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_FLOAT__MAX, oldMax, max));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMin(Float newMin) {
 		Float oldMin = min;
 		min = newMin;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_FLOAT__MIN, oldMin, min));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (min: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAIntegerImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAIntegerImpl.java
index 466e0646748..fcc8e79c0b9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAIntegerImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAIntegerImpl.java
@@ -29,18 +29,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl#getMin <em>Min</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl#getMax <em>Max</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl#getMin <em>Min</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EAIntegerImpl#getMax <em>Max</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
+
 	/**
 	 * The default value of the '{@link #getMin() <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	 * The cached value of the '{@link #getMin() <em>Min</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMin()
 	 * @generated
 	 * @ordered
@@ -61,6 +64,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	 * The default value of the '{@link #getMax() <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -71,6 +75,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	 * The cached value of the '{@link #getMax() <em>Max</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMax()
 	 * @generated
 	 * @ordered
@@ -80,6 +85,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EAIntegerImpl() {
@@ -89,15 +95,16 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.EA_INTEGER__MIN:
-				return getMin();
-			case DatatypesPackage.EA_INTEGER__MAX:
-				return getMax();
+		switch(featureID) {
+		case DatatypesPackage.EA_INTEGER__MIN:
+			return getMin();
+		case DatatypesPackage.EA_INTEGER__MAX:
+			return getMax();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -105,15 +112,16 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_INTEGER__MIN:
-				return min != MIN_EDEFAULT;
-			case DatatypesPackage.EA_INTEGER__MAX:
-				return max != MAX_EDEFAULT;
+		switch(featureID) {
+		case DatatypesPackage.EA_INTEGER__MIN:
+			return min != MIN_EDEFAULT;
+		case DatatypesPackage.EA_INTEGER__MAX:
+			return max != MAX_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -121,17 +129,18 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.EA_INTEGER__MIN:
-				setMin((Integer)newValue);
-				return;
-			case DatatypesPackage.EA_INTEGER__MAX:
-				setMax((Integer)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_INTEGER__MIN:
+			setMin((Integer)newValue);
+			return;
+		case DatatypesPackage.EA_INTEGER__MAX:
+			setMax((Integer)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -139,6 +148,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,17 +159,18 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.EA_INTEGER__MIN:
-				setMin(MIN_EDEFAULT);
-				return;
-			case DatatypesPackage.EA_INTEGER__MAX:
-				setMax(MAX_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.EA_INTEGER__MIN:
+			setMin(MIN_EDEFAULT);
+			return;
+		case DatatypesPackage.EA_INTEGER__MAX:
+			setMax(MAX_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -167,6 +178,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getMax() {
@@ -176,6 +188,7 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getMin() {
@@ -185,35 +198,39 @@ public class EAIntegerImpl extends RangeableDatatypeImpl implements EAInteger {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMax(int newMax) {
 		int oldMax = max;
 		max = newMax;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_INTEGER__MAX, oldMax, max));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMin(int newMin) {
 		int oldMin = min;
 		min = newMin;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.EA_INTEGER__MIN, oldMin, min));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (min: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAStringImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAStringImpl.java
index 72375d77803..aff1712dad3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAStringImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EAStringImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAString;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class EAStringImpl extends EADatatypeImpl implements EAString {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EAStringImpl() {
@@ -42,6 +44,7 @@ public class EAStringImpl extends EADatatypeImpl implements EAString {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationImpl.java
index d6e3b275524..b652605dc94 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationImpl.java
@@ -34,17 +34,19 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl#getLiteral <em>Literal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationImpl#getLiteral <em>Literal</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class EnumerationImpl extends EADatatypeImpl implements Enumeration {

+

 	/**

 	 * The cached value of the '{@link #getLiteral() <em>Literal</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getLiteral()

 	 * @generated

 	 * @ordered

@@ -54,6 +56,7 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected EnumerationImpl() {

@@ -63,6 +66,7 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -73,10 +77,11 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<EnumerationLiteral> getLiteral() {

-		if (literal == null) {

+		if(literal == null) {

 			literal = new EObjectContainmentEList<EnumerationLiteral>(EnumerationLiteral.class, this, DatatypesPackage.ENUMERATION__LITERAL);

 		}

 		return literal;

@@ -85,13 +90,14 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case DatatypesPackage.ENUMERATION__LITERAL:

-				return ((InternalEList<?>)getLiteral()).basicRemove(otherEnd, msgs);

+		switch(featureID) {

+		case DatatypesPackage.ENUMERATION__LITERAL:

+			return ((InternalEList<?>)getLiteral()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -99,13 +105,14 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case DatatypesPackage.ENUMERATION__LITERAL:

-				return getLiteral();

+		switch(featureID) {

+		case DatatypesPackage.ENUMERATION__LITERAL:

+			return getLiteral();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -113,16 +120,17 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case DatatypesPackage.ENUMERATION__LITERAL:

-				getLiteral().clear();

-				getLiteral().addAll((Collection<? extends EnumerationLiteral>)newValue);

-				return;

+		switch(featureID) {

+		case DatatypesPackage.ENUMERATION__LITERAL:

+			getLiteral().clear();

+			getLiteral().addAll((Collection<? extends EnumerationLiteral>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -130,14 +138,15 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case DatatypesPackage.ENUMERATION__LITERAL:

-				getLiteral().clear();

-				return;

+		switch(featureID) {

+		case DatatypesPackage.ENUMERATION__LITERAL:

+			getLiteral().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -145,13 +154,14 @@ public class EnumerationImpl extends EADatatypeImpl implements Enumeration {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case DatatypesPackage.ENUMERATION__LITERAL:

-				return literal != null && !literal.isEmpty();

+		switch(featureID) {

+		case DatatypesPackage.ENUMERATION__LITERAL:

+			return literal != null && !literal.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationLiteralImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationLiteralImpl.java
index af987c531f4..e841650fbea 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationLiteralImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationLiteralImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl;
  * <!-- end-user-doc -->

  * <p>

  * </p>

- *

+ * 

  * @generated

  */

 public class EnumerationLiteralImpl extends EAElementImpl implements EnumerationLiteral {

+

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected EnumerationLiteralImpl() {

@@ -42,6 +44,7 @@ public class EnumerationLiteralImpl extends EAElementImpl implements Enumeration
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationValueTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationValueTypeImpl.java
index 9e873951193..0486a3f7500 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationValueTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/EnumerationValueTypeImpl.java
@@ -35,19 +35,21 @@ import org.eclipse.uml2.uml.Enumeration;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#isIsMultiValued <em>Is Multi Valued</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#getLiteralSemantics <em>Literal Semantics</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#getBase_Enumeration <em>Base Enumeration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#isIsMultiValued <em>Is Multi Valued</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#getLiteralSemantics <em>Literal Semantics</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.EnumerationValueTypeImpl#getBase_Enumeration <em>Base Enumeration</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EnumerationValueTypeImpl extends ValueTypeImpl implements EnumerationValueType {
+
 	/**
 	 * The default value of the '{@link #isIsMultiValued() <em>Is Multi Valued</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsMultiValued()
 	 * @generated
 	 * @ordered
@@ -58,6 +60,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	 * The cached value of the '{@link #isIsMultiValued() <em>Is Multi Valued</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsMultiValued()
 	 * @generated
 	 * @ordered
@@ -68,6 +71,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	 * The cached value of the '{@link #getLiteralSemantics() <em>Literal Semantics</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLiteralSemantics()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	 * The cached value of the '{@link #getBase_Enumeration() <em>Base Enumeration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Enumeration()
 	 * @generated
 	 * @ordered
@@ -87,6 +92,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EnumerationValueTypeImpl() {
@@ -96,18 +102,20 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
-				return isIsMultiValued();
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
-				return getLiteralSemantics();
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
-				if (resolve) return getBase_Enumeration();
-				return basicGetBase_Enumeration();
+		switch(featureID) {
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
+			return isIsMultiValued();
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
+			return getLiteralSemantics();
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
+			if(resolve)
+				return getBase_Enumeration();
+			return basicGetBase_Enumeration();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -115,17 +123,18 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
-				return isMultiValued != IS_MULTI_VALUED_EDEFAULT;
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
-				return literalSemantics != null && !literalSemantics.isEmpty();
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
-				return base_Enumeration != null;
+		switch(featureID) {
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
+			return isMultiValued != IS_MULTI_VALUED_EDEFAULT;
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
+			return literalSemantics != null && !literalSemantics.isEmpty();
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
+			return base_Enumeration != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -133,22 +142,23 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
-				setIsMultiValued((Boolean)newValue);
-				return;
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
-				getLiteralSemantics().clear();
-				getLiteralSemantics().addAll((Collection<? extends String>)newValue);
-				return;
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
-				setBase_Enumeration((Enumeration)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
+			setIsMultiValued((Boolean)newValue);
+			return;
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
+			getLiteralSemantics().clear();
+			getLiteralSemantics().addAll((Collection<? extends String>)newValue);
+			return;
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
+			setBase_Enumeration((Enumeration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -156,6 +166,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,20 +177,21 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
-				setIsMultiValued(IS_MULTI_VALUED_EDEFAULT);
-				return;
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
-				getLiteralSemantics().clear();
-				return;
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
-				setBase_Enumeration((Enumeration)null);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED:
+			setIsMultiValued(IS_MULTI_VALUED_EDEFAULT);
+			return;
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS:
+			getLiteralSemantics().clear();
+			return;
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION:
+			setBase_Enumeration((Enumeration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -187,10 +199,11 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<String> getLiteralSemantics() {
-		if (literalSemantics == null) {
+		if(literalSemantics == null) {
 			literalSemantics = new EDataTypeEList<String>(String.class, this, DatatypesPackage.ENUMERATION_VALUE_TYPE__LITERAL_SEMANTICS);
 		}
 		return literalSemantics;
@@ -199,14 +212,15 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Enumeration getBase_Enumeration() {
-		if (base_Enumeration != null && base_Enumeration.eIsProxy()) {
+		if(base_Enumeration != null && base_Enumeration.eIsProxy()) {
 			InternalEObject oldBase_Enumeration = (InternalEObject)base_Enumeration;
 			base_Enumeration = (Enumeration)eResolveProxy(oldBase_Enumeration);
-			if (base_Enumeration != oldBase_Enumeration) {
-				if (eNotificationRequired())
+			if(base_Enumeration != oldBase_Enumeration) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION, oldBase_Enumeration, base_Enumeration));
 			}
 		}
@@ -216,6 +230,7 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Enumeration basicGetBase_Enumeration() {
@@ -225,18 +240,20 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Enumeration(Enumeration newBase_Enumeration) {
 		Enumeration oldBase_Enumeration = base_Enumeration;
 		base_Enumeration = newBase_Enumeration;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.ENUMERATION_VALUE_TYPE__BASE_ENUMERATION, oldBase_Enumeration, base_Enumeration));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsMultiValued() {
@@ -246,23 +263,26 @@ public class EnumerationValueTypeImpl extends ValueTypeImpl implements Enumerati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsMultiValued(boolean newIsMultiValued) {
 		boolean oldIsMultiValued = isMultiValued;
 		isMultiValued = newIsMultiValued;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.ENUMERATION_VALUE_TYPE__IS_MULTI_VALUED, oldIsMultiValued, isMultiValued));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isMultiValued: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableDatatypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableDatatypeImpl.java
index 31b90ba94fd..7d0da1ae450 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableDatatypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableDatatypeImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class RangeableDatatypeImpl extends EADatatypeImpl implements RangeableDatatype {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RangeableDatatypeImpl() {
@@ -42,6 +44,7 @@ public abstract class RangeableDatatypeImpl extends EADatatypeImpl implements Ra
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableValueTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableValueTypeImpl.java
index a1754d4f64e..d27c7e48a34 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableValueTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/RangeableValueTypeImpl.java
@@ -29,19 +29,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getResolution <em>Resolution</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getSignificantDigits <em>Significant Digits</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getAccuracy <em>Accuracy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.RangeableValueTypeImpl#getSignificantDigits <em>Significant Digits</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableValueType {
+
 	/**
 	 * The default value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAccuracy()
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	 * The cached value of the '{@link #getAccuracy() <em>Accuracy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAccuracy()
 	 * @generated
 	 * @ordered
@@ -62,6 +65,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	 * The default value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -82,6 +87,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	 * The default value of the '{@link #getSignificantDigits() <em>Significant Digits</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSignificantDigits()
 	 * @generated
 	 * @ordered
@@ -92,6 +98,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	 * The cached value of the '{@link #getSignificantDigits() <em>Significant Digits</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSignificantDigits()
 	 * @generated
 	 * @ordered
@@ -101,6 +108,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RangeableValueTypeImpl() {
@@ -110,17 +118,18 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
-				return getAccuracy();
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
-				return getResolution();
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
-				return getSignificantDigits();
+		switch(featureID) {
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
+			return getAccuracy();
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
+			return getResolution();
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
+			return getSignificantDigits();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -128,17 +137,18 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
-				return ACCURACY_EDEFAULT == null ? accuracy != null : !ACCURACY_EDEFAULT.equals(accuracy);
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
-				return RESOLUTION_EDEFAULT == null ? resolution != null : !RESOLUTION_EDEFAULT.equals(resolution);
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
-				return significantDigits != SIGNIFICANT_DIGITS_EDEFAULT;
+		switch(featureID) {
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
+			return ACCURACY_EDEFAULT == null ? accuracy != null : !ACCURACY_EDEFAULT.equals(accuracy);
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
+			return RESOLUTION_EDEFAULT == null ? resolution != null : !RESOLUTION_EDEFAULT.equals(resolution);
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
+			return significantDigits != SIGNIFICANT_DIGITS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -146,20 +156,21 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
-				setAccuracy((Float)newValue);
-				return;
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
-				setResolution((Float)newValue);
-				return;
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
-				setSignificantDigits((Integer)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
+			setAccuracy((Float)newValue);
+			return;
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
+			setResolution((Float)newValue);
+			return;
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
+			setSignificantDigits((Integer)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -167,6 +178,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,20 +189,21 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
-				setAccuracy(ACCURACY_EDEFAULT);
-				return;
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
-				setResolution(RESOLUTION_EDEFAULT);
-				return;
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
-				setSignificantDigits(SIGNIFICANT_DIGITS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY:
+			setAccuracy(ACCURACY_EDEFAULT);
+			return;
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION:
+			setResolution(RESOLUTION_EDEFAULT);
+			return;
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS:
+			setSignificantDigits(SIGNIFICANT_DIGITS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,6 +211,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getAccuracy() {
@@ -207,6 +221,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getResolution() {
@@ -216,6 +231,7 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getSignificantDigits() {
@@ -225,47 +241,52 @@ public class RangeableValueTypeImpl extends ValueTypeImpl implements RangeableVa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAccuracy(Float newAccuracy) {
 		Float oldAccuracy = accuracy;
 		accuracy = newAccuracy;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.RANGEABLE_VALUE_TYPE__ACCURACY, oldAccuracy, accuracy));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setResolution(Float newResolution) {
 		Float oldResolution = resolution;
 		resolution = newResolution;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.RANGEABLE_VALUE_TYPE__RESOLUTION, oldResolution, resolution));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSignificantDigits(int newSignificantDigits) {
 		int oldSignificantDigits = significantDigits;
 		significantDigits = newSignificantDigits;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.RANGEABLE_VALUE_TYPE__SIGNIFICANT_DIGITS, oldSignificantDigits, significantDigits));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (accuracy: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/ValueTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/ValueTypeImpl.java
index b5e297d01d0..d5a63a2fcc4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/ValueTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/impl/ValueTypeImpl.java
@@ -29,19 +29,21 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getSemantics <em>Semantics</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getDimension <em>Dimension</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getUnit <em>Unit</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getSemantics <em>Semantics</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getDimension <em>Dimension</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.impl.ValueTypeImpl#getUnit <em>Unit</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType {
+
 	/**
 	 * The default value of the '{@link #getSemantics() <em>Semantics</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSemantics()
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	 * The cached value of the '{@link #getSemantics() <em>Semantics</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSemantics()
 	 * @generated
 	 * @ordered
@@ -62,6 +65,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	 * The default value of the '{@link #getDimension() <em>Dimension</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDimension()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	 * The cached value of the '{@link #getDimension() <em>Dimension</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDimension()
 	 * @generated
 	 * @ordered
@@ -82,6 +87,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUnit()
 	 * @generated
 	 * @ordered
@@ -92,6 +98,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUnit()
 	 * @generated
 	 * @ordered
@@ -101,6 +108,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ValueTypeImpl() {
@@ -110,17 +118,18 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DatatypesPackage.VALUE_TYPE__SEMANTICS:
-				return getSemantics();
-			case DatatypesPackage.VALUE_TYPE__DIMENSION:
-				return getDimension();
-			case DatatypesPackage.VALUE_TYPE__UNIT:
-				return getUnit();
+		switch(featureID) {
+		case DatatypesPackage.VALUE_TYPE__SEMANTICS:
+			return getSemantics();
+		case DatatypesPackage.VALUE_TYPE__DIMENSION:
+			return getDimension();
+		case DatatypesPackage.VALUE_TYPE__UNIT:
+			return getUnit();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -128,17 +137,18 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.VALUE_TYPE__SEMANTICS:
-				return SEMANTICS_EDEFAULT == null ? semantics != null : !SEMANTICS_EDEFAULT.equals(semantics);
-			case DatatypesPackage.VALUE_TYPE__DIMENSION:
-				return DIMENSION_EDEFAULT == null ? dimension != null : !DIMENSION_EDEFAULT.equals(dimension);
-			case DatatypesPackage.VALUE_TYPE__UNIT:
-				return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);
+		switch(featureID) {
+		case DatatypesPackage.VALUE_TYPE__SEMANTICS:
+			return SEMANTICS_EDEFAULT == null ? semantics != null : !SEMANTICS_EDEFAULT.equals(semantics);
+		case DatatypesPackage.VALUE_TYPE__DIMENSION:
+			return DIMENSION_EDEFAULT == null ? dimension != null : !DIMENSION_EDEFAULT.equals(dimension);
+		case DatatypesPackage.VALUE_TYPE__UNIT:
+			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -146,20 +156,21 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DatatypesPackage.VALUE_TYPE__SEMANTICS:
-				setSemantics((String)newValue);
-				return;
-			case DatatypesPackage.VALUE_TYPE__DIMENSION:
-				setDimension((String)newValue);
-				return;
-			case DatatypesPackage.VALUE_TYPE__UNIT:
-				setUnit((String)newValue);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.VALUE_TYPE__SEMANTICS:
+			setSemantics((String)newValue);
+			return;
+		case DatatypesPackage.VALUE_TYPE__DIMENSION:
+			setDimension((String)newValue);
+			return;
+		case DatatypesPackage.VALUE_TYPE__UNIT:
+			setUnit((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -167,6 +178,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,6 +189,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSemantics() {
@@ -186,32 +199,34 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSemantics(String newSemantics) {
 		String oldSemantics = semantics;
 		semantics = newSemantics;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.VALUE_TYPE__SEMANTICS, oldSemantics, semantics));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DatatypesPackage.VALUE_TYPE__SEMANTICS:
-				setSemantics(SEMANTICS_EDEFAULT);
-				return;
-			case DatatypesPackage.VALUE_TYPE__DIMENSION:
-				setDimension(DIMENSION_EDEFAULT);
-				return;
-			case DatatypesPackage.VALUE_TYPE__UNIT:
-				setUnit(UNIT_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DatatypesPackage.VALUE_TYPE__SEMANTICS:
+			setSemantics(SEMANTICS_EDEFAULT);
+			return;
+		case DatatypesPackage.VALUE_TYPE__DIMENSION:
+			setDimension(DIMENSION_EDEFAULT);
+			return;
+		case DatatypesPackage.VALUE_TYPE__UNIT:
+			setUnit(UNIT_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -219,6 +234,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDimension() {
@@ -228,6 +244,7 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getUnit() {
@@ -237,35 +254,39 @@ public abstract class ValueTypeImpl extends EADatatypeImpl implements ValueType
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDimension(String newDimension) {
 		String oldDimension = dimension;
 		dimension = newDimension;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.VALUE_TYPE__DIMENSION, oldDimension, dimension));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUnit(String newUnit) {
 		String oldUnit = unit;
 		unit = newUnit;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DatatypesPackage.VALUE_TYPE__UNIT, oldUnit, unit));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (semantics: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesAdapterFactory.java
index 55db4badcab..f125c7716e7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.infrastructure.datatypes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean;
@@ -39,8 +40,9 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 
 
 /**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage
  * @generated
  */
@@ -49,6 +51,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DatatypesPackage modelPackage;
@@ -57,86 +60,105 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DatatypesSwitch<Adapter> modelSwitch = new DatatypesSwitch<Adapter>() {
-			@Override
-			public Adapter caseEADatatype(EADatatype object) {
-				return createEADatatypeAdapter();
-			}
-			@Override
-			public Adapter caseEADatatypePrototype(EADatatypePrototype object) {
-				return createEADatatypePrototypeAdapter();
-			}
-			@Override
-			public Adapter caseValueType(ValueType object) {
-				return createValueTypeAdapter();
-			}
-			@Override
-			public Adapter caseRangeableDatatype(RangeableDatatype object) {
-				return createRangeableDatatypeAdapter();
-			}
-			@Override
-			public Adapter caseRangeableValueType(RangeableValueType object) {
-				return createRangeableValueTypeAdapter();
-			}
-			@Override
-			public Adapter caseEnumerationValueType(EnumerationValueType object) {
-				return createEnumerationValueTypeAdapter();
-			}
-			@Override
-			public Adapter caseCompositeDatatype(CompositeDatatype object) {
-				return createCompositeDatatypeAdapter();
-			}
-			@Override
-			public Adapter caseEAString(EAString object) {
-				return createEAStringAdapter();
-			}
-			@Override
-			public Adapter caseEABoolean(EABoolean object) {
-				return createEABooleanAdapter();
-			}
-			@Override
-			public Adapter caseEAFloat(EAFloat object) {
-				return createEAFloatAdapter();
-			}
-			@Override
-			public Adapter caseEAInteger(EAInteger object) {
-				return createEAIntegerAdapter();
-			}
-			@Override
-			public Adapter caseEnumerationLiteral(EnumerationLiteral object) {
-				return createEnumerationLiteralAdapter();
-			}
-			@Override
-			public Adapter caseEnumeration(Enumeration object) {
-				return createEnumerationAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter caseEADatatype(EADatatype object) {
+			return createEADatatypeAdapter();
+		}
+
+		@Override
+		public Adapter caseEADatatypePrototype(EADatatypePrototype object) {
+			return createEADatatypePrototypeAdapter();
+		}
+
+		@Override
+		public Adapter caseValueType(ValueType object) {
+			return createValueTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseRangeableDatatype(RangeableDatatype object) {
+			return createRangeableDatatypeAdapter();
+		}
+
+		@Override
+		public Adapter caseRangeableValueType(RangeableValueType object) {
+			return createRangeableValueTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseEnumerationValueType(EnumerationValueType object) {
+			return createEnumerationValueTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseCompositeDatatype(CompositeDatatype object) {
+			return createCompositeDatatypeAdapter();
+		}
+
+		@Override
+		public Adapter caseEAString(EAString object) {
+			return createEAStringAdapter();
+		}
+
+		@Override
+		public Adapter caseEABoolean(EABoolean object) {
+			return createEABooleanAdapter();
+		}
+
+		@Override
+		public Adapter caseEAFloat(EAFloat object) {
+			return createEAFloatAdapter();
+		}
+
+		@Override
+		public Adapter caseEAInteger(EAInteger object) {
+			return createEAIntegerAdapter();
+		}
+
+		@Override
+		public Adapter caseEnumerationLiteral(EnumerationLiteral object) {
+			return createEnumerationLiteralAdapter();
+		}
+
+		@Override
+		public Adapter caseEnumeration(Enumeration object) {
+			return createEnumerationAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DatatypesPackage.eINSTANCE;
 		}
 	}
@@ -144,7 +166,9 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -159,6 +183,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatype
 	 * @generated
@@ -168,11 +193,13 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype <em>EA Datatype Prototype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype
+	 * <em>EA Datatype Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype
 	 * @generated
@@ -182,11 +209,13 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype <em>Composite Datatype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype
+	 * <em>Composite Datatype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype
 	 * @generated
@@ -201,6 +230,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAString
 	 * @generated
@@ -215,6 +245,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean
 	 * @generated
@@ -229,6 +260,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAFloat
 	 * @generated
@@ -243,6 +275,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EAInteger
 	 * @generated
@@ -252,11 +285,13 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral <em>Enumeration Literal</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral
+	 * <em>Enumeration Literal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationLiteral
 	 * @generated
@@ -271,6 +306,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.Enumeration
 	 * @generated
@@ -285,6 +321,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -294,11 +331,13 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -308,11 +347,13 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType <em>Enumeration Value Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType
+	 * <em>Enumeration Value Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.EnumerationValueType
 	 * @generated
@@ -325,6 +366,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This default
 	 * implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -333,10 +375,12 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype <em>Rangeable Datatype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype
+	 * <em>Rangeable Datatype</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns
 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
 	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableDatatype
 	 * @generated
@@ -346,10 +390,12 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType <em>Rangeable Value Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType
+	 * <em>Rangeable Value Type</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns
 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
 	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.RangeableValueType
 	 * @generated
@@ -359,10 +405,12 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc --> This default implementation
 	 * returns null so that we can easily ignore cases; it's useful to ignore a case when
 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -376,6 +424,7 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so
 	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all
 	 * the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.ValueType
 	 * @generated
@@ -389,15 +438,16 @@ public class DatatypesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc
 	 * --> This implementation returns <code>true</code> if the object is either the model's package
 	 * or is an instance object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceFactoryImpl.java
index 249a732c258..cc4cde9961d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.util.DatatypesResourceImpl
  * @generated
  */
 public class DatatypesResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class DatatypesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceImpl.java
index da124d395cf..2f1c575e9c0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.util.DatatypesResourceFactoryImpl
  * @generated
  */
 public class DatatypesResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public DatatypesResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesSwitch.java
index ad410db31e5..2b85374fe06 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.infrastructure.datatypes.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.infrastructure.datatypes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.CompositeDatatype;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage;
 import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EABoolean;
@@ -43,6 +44,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * each class of the model, starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage
  * @generated
  */
@@ -51,6 +53,7 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DatatypesPackage modelPackage;
@@ -58,10 +61,11 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	/**
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DatatypesPackage.eINSTANCE;
 		}
 	}
@@ -70,6 +74,7 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -85,7 +90,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Composite Datatype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -100,7 +107,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA String</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -115,7 +124,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Boolean</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -130,7 +141,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Float</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -145,7 +158,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Integer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -160,7 +175,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Enumeration Literal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -175,7 +192,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Enumeration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -190,7 +209,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -205,7 +226,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -220,7 +243,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Enumeration Value Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -233,7 +258,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Rangeable Datatype</em>'.
 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
 	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rangeable Datatype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -246,7 +273,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Rangeable Value Type</em>'.
 	 * <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rangeable Value Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -259,7 +288,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -274,7 +305,7 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Value Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -289,7 +320,7 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -302,140 +333,217 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	/**
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case DatatypesPackage.EA_DATATYPE: {
-				EADatatype eaDatatype = (EADatatype)theEObject;
-				T result = caseEADatatype(eaDatatype);
-				if (result == null) result = caseTraceableSpecification(eaDatatype);
-				if (result == null) result = caseEAPackageableElement(eaDatatype);
-				if (result == null) result = caseEAElement(eaDatatype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.EA_DATATYPE_PROTOTYPE: {
-				EADatatypePrototype eaDatatypePrototype = (EADatatypePrototype)theEObject;
-				T result = caseEADatatypePrototype(eaDatatypePrototype);
-				if (result == null) result = caseEAElement(eaDatatypePrototype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.VALUE_TYPE: {
-				ValueType valueType = (ValueType)theEObject;
-				T result = caseValueType(valueType);
-				if (result == null) result = caseEADatatype(valueType);
-				if (result == null) result = caseTraceableSpecification(valueType);
-				if (result == null) result = caseEAPackageableElement(valueType);
-				if (result == null) result = caseEAElement(valueType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.RANGEABLE_DATATYPE: {
-				RangeableDatatype rangeableDatatype = (RangeableDatatype)theEObject;
-				T result = caseRangeableDatatype(rangeableDatatype);
-				if (result == null) result = caseEADatatype(rangeableDatatype);
-				if (result == null) result = caseTraceableSpecification(rangeableDatatype);
-				if (result == null) result = caseEAPackageableElement(rangeableDatatype);
-				if (result == null) result = caseEAElement(rangeableDatatype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.RANGEABLE_VALUE_TYPE: {
-				RangeableValueType rangeableValueType = (RangeableValueType)theEObject;
-				T result = caseRangeableValueType(rangeableValueType);
-				if (result == null) result = caseValueType(rangeableValueType);
-				if (result == null) result = caseEADatatype(rangeableValueType);
-				if (result == null) result = caseTraceableSpecification(rangeableValueType);
-				if (result == null) result = caseEAPackageableElement(rangeableValueType);
-				if (result == null) result = caseEAElement(rangeableValueType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.ENUMERATION_VALUE_TYPE: {
-				EnumerationValueType enumerationValueType = (EnumerationValueType)theEObject;
-				T result = caseEnumerationValueType(enumerationValueType);
-				if (result == null) result = caseValueType(enumerationValueType);
-				if (result == null) result = caseEADatatype(enumerationValueType);
-				if (result == null) result = caseTraceableSpecification(enumerationValueType);
-				if (result == null) result = caseEAPackageableElement(enumerationValueType);
-				if (result == null) result = caseEAElement(enumerationValueType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.COMPOSITE_DATATYPE: {
-				CompositeDatatype compositeDatatype = (CompositeDatatype)theEObject;
-				T result = caseCompositeDatatype(compositeDatatype);
-				if (result == null) result = caseEADatatype(compositeDatatype);
-				if (result == null) result = caseTraceableSpecification(compositeDatatype);
-				if (result == null) result = caseEAPackageableElement(compositeDatatype);
-				if (result == null) result = caseEAElement(compositeDatatype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.EA_STRING: {
-				EAString eaString = (EAString)theEObject;
-				T result = caseEAString(eaString);
-				if (result == null) result = caseEADatatype(eaString);
-				if (result == null) result = caseTraceableSpecification(eaString);
-				if (result == null) result = caseEAPackageableElement(eaString);
-				if (result == null) result = caseEAElement(eaString);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.EA_BOOLEAN: {
-				EABoolean eaBoolean = (EABoolean)theEObject;
-				T result = caseEABoolean(eaBoolean);
-				if (result == null) result = caseEADatatype(eaBoolean);
-				if (result == null) result = caseTraceableSpecification(eaBoolean);
-				if (result == null) result = caseEAPackageableElement(eaBoolean);
-				if (result == null) result = caseEAElement(eaBoolean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.EA_FLOAT: {
-				EAFloat eaFloat = (EAFloat)theEObject;
-				T result = caseEAFloat(eaFloat);
-				if (result == null) result = caseRangeableDatatype(eaFloat);
-				if (result == null) result = caseEADatatype(eaFloat);
-				if (result == null) result = caseTraceableSpecification(eaFloat);
-				if (result == null) result = caseEAPackageableElement(eaFloat);
-				if (result == null) result = caseEAElement(eaFloat);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.EA_INTEGER: {
-				EAInteger eaInteger = (EAInteger)theEObject;
-				T result = caseEAInteger(eaInteger);
-				if (result == null) result = caseRangeableDatatype(eaInteger);
-				if (result == null) result = caseEADatatype(eaInteger);
-				if (result == null) result = caseTraceableSpecification(eaInteger);
-				if (result == null) result = caseEAPackageableElement(eaInteger);
-				if (result == null) result = caseEAElement(eaInteger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.ENUMERATION_LITERAL: {
-				EnumerationLiteral enumerationLiteral = (EnumerationLiteral)theEObject;
-				T result = caseEnumerationLiteral(enumerationLiteral);
-				if (result == null) result = caseEAElement(enumerationLiteral);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DatatypesPackage.ENUMERATION: {
-				Enumeration enumeration = (Enumeration)theEObject;
-				T result = caseEnumeration(enumeration);
-				if (result == null) result = caseEADatatype(enumeration);
-				if (result == null) result = caseTraceableSpecification(enumeration);
-				if (result == null) result = caseEAPackageableElement(enumeration);
-				if (result == null) result = caseEAElement(enumeration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case DatatypesPackage.EA_DATATYPE:
+		{
+			EADatatype eaDatatype = (EADatatype)theEObject;
+			T result = caseEADatatype(eaDatatype);
+			if(result == null)
+				result = caseTraceableSpecification(eaDatatype);
+			if(result == null)
+				result = caseEAPackageableElement(eaDatatype);
+			if(result == null)
+				result = caseEAElement(eaDatatype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.EA_DATATYPE_PROTOTYPE:
+		{
+			EADatatypePrototype eaDatatypePrototype = (EADatatypePrototype)theEObject;
+			T result = caseEADatatypePrototype(eaDatatypePrototype);
+			if(result == null)
+				result = caseEAElement(eaDatatypePrototype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.VALUE_TYPE:
+		{
+			ValueType valueType = (ValueType)theEObject;
+			T result = caseValueType(valueType);
+			if(result == null)
+				result = caseEADatatype(valueType);
+			if(result == null)
+				result = caseTraceableSpecification(valueType);
+			if(result == null)
+				result = caseEAPackageableElement(valueType);
+			if(result == null)
+				result = caseEAElement(valueType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.RANGEABLE_DATATYPE:
+		{
+			RangeableDatatype rangeableDatatype = (RangeableDatatype)theEObject;
+			T result = caseRangeableDatatype(rangeableDatatype);
+			if(result == null)
+				result = caseEADatatype(rangeableDatatype);
+			if(result == null)
+				result = caseTraceableSpecification(rangeableDatatype);
+			if(result == null)
+				result = caseEAPackageableElement(rangeableDatatype);
+			if(result == null)
+				result = caseEAElement(rangeableDatatype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.RANGEABLE_VALUE_TYPE:
+		{
+			RangeableValueType rangeableValueType = (RangeableValueType)theEObject;
+			T result = caseRangeableValueType(rangeableValueType);
+			if(result == null)
+				result = caseValueType(rangeableValueType);
+			if(result == null)
+				result = caseEADatatype(rangeableValueType);
+			if(result == null)
+				result = caseTraceableSpecification(rangeableValueType);
+			if(result == null)
+				result = caseEAPackageableElement(rangeableValueType);
+			if(result == null)
+				result = caseEAElement(rangeableValueType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.ENUMERATION_VALUE_TYPE:
+		{
+			EnumerationValueType enumerationValueType = (EnumerationValueType)theEObject;
+			T result = caseEnumerationValueType(enumerationValueType);
+			if(result == null)
+				result = caseValueType(enumerationValueType);
+			if(result == null)
+				result = caseEADatatype(enumerationValueType);
+			if(result == null)
+				result = caseTraceableSpecification(enumerationValueType);
+			if(result == null)
+				result = caseEAPackageableElement(enumerationValueType);
+			if(result == null)
+				result = caseEAElement(enumerationValueType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.COMPOSITE_DATATYPE:
+		{
+			CompositeDatatype compositeDatatype = (CompositeDatatype)theEObject;
+			T result = caseCompositeDatatype(compositeDatatype);
+			if(result == null)
+				result = caseEADatatype(compositeDatatype);
+			if(result == null)
+				result = caseTraceableSpecification(compositeDatatype);
+			if(result == null)
+				result = caseEAPackageableElement(compositeDatatype);
+			if(result == null)
+				result = caseEAElement(compositeDatatype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.EA_STRING:
+		{
+			EAString eaString = (EAString)theEObject;
+			T result = caseEAString(eaString);
+			if(result == null)
+				result = caseEADatatype(eaString);
+			if(result == null)
+				result = caseTraceableSpecification(eaString);
+			if(result == null)
+				result = caseEAPackageableElement(eaString);
+			if(result == null)
+				result = caseEAElement(eaString);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.EA_BOOLEAN:
+		{
+			EABoolean eaBoolean = (EABoolean)theEObject;
+			T result = caseEABoolean(eaBoolean);
+			if(result == null)
+				result = caseEADatatype(eaBoolean);
+			if(result == null)
+				result = caseTraceableSpecification(eaBoolean);
+			if(result == null)
+				result = caseEAPackageableElement(eaBoolean);
+			if(result == null)
+				result = caseEAElement(eaBoolean);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.EA_FLOAT:
+		{
+			EAFloat eaFloat = (EAFloat)theEObject;
+			T result = caseEAFloat(eaFloat);
+			if(result == null)
+				result = caseRangeableDatatype(eaFloat);
+			if(result == null)
+				result = caseEADatatype(eaFloat);
+			if(result == null)
+				result = caseTraceableSpecification(eaFloat);
+			if(result == null)
+				result = caseEAPackageableElement(eaFloat);
+			if(result == null)
+				result = caseEAElement(eaFloat);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.EA_INTEGER:
+		{
+			EAInteger eaInteger = (EAInteger)theEObject;
+			T result = caseEAInteger(eaInteger);
+			if(result == null)
+				result = caseRangeableDatatype(eaInteger);
+			if(result == null)
+				result = caseEADatatype(eaInteger);
+			if(result == null)
+				result = caseTraceableSpecification(eaInteger);
+			if(result == null)
+				result = caseEAPackageableElement(eaInteger);
+			if(result == null)
+				result = caseEAElement(eaInteger);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.ENUMERATION_LITERAL:
+		{
+			EnumerationLiteral enumerationLiteral = (EnumerationLiteral)theEObject;
+			T result = caseEnumerationLiteral(enumerationLiteral);
+			if(result == null)
+				result = caseEAElement(enumerationLiteral);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DatatypesPackage.ENUMERATION:
+		{
+			Enumeration enumeration = (Enumeration)theEObject;
+			T result = caseEnumeration(enumeration);
+			if(result == null)
+				result = caseEADatatype(enumeration);
+			if(result == null)
+				result = caseTraceableSpecification(enumeration);
+			if(result == null)
+				result = caseEAPackageableElement(enumeration);
+			if(result == null)
+				result = caseEAElement(enumeration);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -445,7 +553,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Datatype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -460,7 +570,9 @@ public class DatatypesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Datatype Prototype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesXMLProcessor.java
index 077c7586bcc..71e9af5da8e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/datatypes/util/DatatypesXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.DatatypesPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DatatypesXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class DatatypesXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DatatypesXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		DatatypesPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the DatatypesResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new DatatypesResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new DatatypesResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Comment.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Comment.java
index 82b12a2ccdc..5741a604e3a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Comment.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Comment.java
@@ -21,28 +21,29 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Comment</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBody <em>Body</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment <em>Base Comment</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBody <em>Body</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getComment()

  * @model

  * @generated

  */

 public interface Comment extends EObject {

+

 	/**

 	 * Returns the value of the '<em><b>Body</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Body</em>' attribute isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Body</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Body</em>' attribute.

 	 * @see #setBody(String)

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getComment_Body()

@@ -55,7 +56,9 @@ public interface Comment extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBody <em>Body</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Body</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Body</em>' attribute.

 	 * @see #getBody()

 	 * @generated

 	 */

@@ -65,10 +68,10 @@ public interface Comment extends EObject {
 	 * Returns the value of the '<em><b>Base Comment</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Comment</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Comment</em>' reference.

 	 * @see #setBase_Comment(org.eclipse.uml2.uml.Comment)

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getComment_Base_Comment()

@@ -81,7 +84,9 @@ public interface Comment extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Comment</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Comment</em>' reference.

 	 * @see #getBase_Comment()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Context.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Context.java
index 5504f6db9df..9cb3bcfaeb8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Context.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Context.java
@@ -21,9 +21,10 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Context</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Context represents a simple and practical way to allocate TraceableSpecifications to a specific EAST-ADL2 model context, and to let this specific model context own Relationships.
+ * Context represents a simple and practical way to allocate TraceableSpecifications to a specific EAST-ADL2 model context, and to let this specific
+ * model context own Relationships.
  * 
  * Semantics:
  * See Relationship and TraceableSpecification.
@@ -32,23 +33,24 @@ import org.eclipse.emf.common.util.EList;
  * Changes:
  * New class in EAST-ADL2
  * 
- * Extension: 
+ * Extension:
  * The Context stereotype is an abstract stereotype which extends UML2 PackageableElement
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getTraceableSpecification <em>Traceable Specification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getOwnedRelationship <em>Owned Relationship</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getTraceableSpecification <em>Traceable Specification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getOwnedRelationship <em>Owned Relationship</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getContext()
  * @model abstract="true"
  * @generated
  */
 public interface Context extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Owned Relationship</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship}.
@@ -57,6 +59,7 @@ public interface Context extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Relationship(s) associated to this context.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Owned Relationship</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getContext_OwnedRelationship()
 	 * @model ordered="false"
@@ -72,6 +75,7 @@ public interface Context extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Traceable specification(s) allocated to this context.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Traceable Specification</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getContext_TraceableSpecification()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAElement.java
index 2f3a56fe4f1..e013e37969c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAElement.java
@@ -25,46 +25,49 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>EA Element</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The EAElement is an abstract metaclass that represents an arbitrary named entity in the domain model. It specializes AUTOSAR Identifiable which has the shortName attribute used for identification of the element within the namespace in which it is defined.
+ * The EAElement is an abstract metaclass that represents an arbitrary named entity in the domain model. It specializes AUTOSAR Identifiable which has
+ * the shortName attribute used for identification of the element within the namespace in which it is defined.
  * 
  * The abbreviation EA in the name of this metaclass is short for EAST-ADL.
  * 
  * 
  * Semantics:
- * Also the EAElement can be used to extend the EAST-ADL2 approach to other languages and standards by adding a generalize relation from the respective (non EAST-ADL2) element to the EAElement.
+ * Also the EAElement can be used to extend the EAST-ADL2 approach to other languages and standards by adding a generalize relation from the
+ * respective (non EAST-ADL2) element to the EAElement.
  * 
  * 
  * Changes:
  * New class in EAST-ADL2
  * 
- * Extension: 
+ * Extension:
  * The EAElement stereotype is an abstract stereotype
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement <em>Base Named Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getOwnedComment <em>Owned Comment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getOwnedComment <em>Owned Comment</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAElement()
  * @model abstract="true"
  * @generated
  */
 public interface EAElement extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAElement_Name()
@@ -78,6 +81,7 @@ public interface EAElement extends EObject {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Owned Comment</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAElement_OwnedComment()
 	 * @model ordered="false"
@@ -89,10 +93,10 @@ public interface EAElement extends EObject {
 	 * Returns the value of the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Named Element</em>' reference.
 	 * @see #setBase_NamedElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAElement_Base_NamedElement()
@@ -102,10 +106,13 @@ public interface EAElement extends EObject {
 	NamedElement getBase_NamedElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement <em>Base Named Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement <em>Base Named Element</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Named Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Named Element</em>' reference.
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 */
@@ -115,7 +122,9 @@ public interface EAElement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackage.java
index 8b42bb41453..fa833272fc4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackage.java
@@ -21,30 +21,31 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>EA Package</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getSubPackages <em>Sub Packages</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getElement <em>Element</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getSubPackages <em>Sub Packages</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package <em>Base Package</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackage()

  * @model

  * @generated

  */

 public interface EAPackage extends EAElement {

+

 	/**

 	 * Returns the value of the '<em><b>Sub Packages</b></em>' containment reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Sub Packages</em>' reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Sub Packages</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Sub Packages</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackage_SubPackages()

 	 * @model containment="true" ordered="false"

@@ -57,10 +58,10 @@ public interface EAPackage extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Element</em>' reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Element</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Element</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackage_Element()

 	 * @model containment="true" ordered="false"

@@ -72,10 +73,10 @@ public interface EAPackage extends EAElement {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Package</em>' reference.

 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackage_Base_Package()

@@ -88,7 +89,9 @@ public interface EAPackage extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Package</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Package</em>' reference.

 	 * @see #getBase_Package()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackageableElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackageableElement.java
index 19c0aecd8ee..5880d7dcf77 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackageableElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/EAPackageableElement.java
@@ -21,27 +21,28 @@ import org.eclipse.uml2.uml.PackageableElement;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>EA Packageable Element</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement <em>Base Packageable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement <em>Base Packageable Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackageableElement()

  * @model abstract="true"

  * @generated

  */

 public interface EAPackageableElement extends EAElement {

+

 	/**

 	 * Returns the value of the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Packageable Element</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Packageable Element</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Packageable Element</em>' reference.

 	 * @see #setBase_PackageableElement(PackageableElement)

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getEAPackageableElement_Base_PackageableElement()

@@ -51,10 +52,13 @@ public interface EAPackageableElement extends EAElement {
 	PackageableElement getBase_PackageableElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement <em>Base Packageable Element</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement

+	 * <em>Base Packageable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Packageable Element</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Packageable Element</em>' reference.

 	 * @see #getBase_PackageableElement()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsFactory.java
index ec3240ede47..8af7e272e25 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage
  * @generated
  */
 public interface ElementsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ElementsFactory eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Multi Level Reference</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Multi Level Reference</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Rationale</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Rationale</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns a new object of class '<em>EA Package</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>EA Package</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Comment</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Comment</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Realization</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Realization</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface ElementsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsPackage.java
index fc1193515b2..4b098026624 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/ElementsPackage.java
@@ -27,41 +27,51 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * This section contains the UML-profile specification, specifying stereotypes in the UML-profile, defined from the metaclasses in the Infrastructure::Elements subprofile. It includes specification details for each stereotype. If the stereotype has properties, which may be referred to as tag definitions, or if the stereotype has constraints, this section also includes specification details for these properties and constraints.
+ * This section contains the UML-profile specification, specifying stereotypes in the UML-profile, defined from the metaclasses in the
+ * Infrastructure::Elements subprofile. It includes specification details for each stereotype. If the stereotype has properties, which may be referred
+ * to as tag definitions, or if the stereotype has constraints, this section also includes specification details for these properties and constraints.
  * 
  * Overview:
- * The Infrastructure::Elements subprofile of EAST-ADL2 defines general-purpose relationship constructs that may be used to model dependencies between structural constructs.
- * The purpose of the stereotypes in this subprofile is to specify rigorously ("formally") the various relationships that may exist between basic constructs.
+ * The Infrastructure::Elements subprofile of EAST-ADL2 defines general-purpose relationship constructs that may be used to model dependencies between
+ * structural constructs.
+ * The purpose of the stereotypes in this subprofile is to specify rigorously ("formally") the various relationships that may exist between basic
+ * constructs.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsFactory
  * @model kind="package"
  * @generated
  */
 public interface ElementsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RelationshipImpl <em>Relationship</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RelationshipImpl <em>Relationship</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RelationshipImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRelationship()
 		 * @generated
@@ -69,9 +79,11 @@ public interface ElementsPackage extends EPackage {
 		EClass RELATIONSHIP = eINSTANCE.getRelationship();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl <em>Traceable Specification</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl
+		 * <em>Traceable Specification</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getTraceableSpecification()
 		 * @generated
@@ -82,14 +94,17 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Note</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TRACEABLE_SPECIFICATION__NOTE = eINSTANCE.getTraceableSpecification_Note();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl <em>EA Packageable Element</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl
+		 * <em>EA Packageable Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAPackageableElement()
 		 * @generated
@@ -100,6 +115,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Packageable Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT = eINSTANCE.getEAPackageableElement_Base_PackageableElement();
@@ -108,6 +124,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl <em>Context</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getContext()
 		 * @generated
@@ -118,6 +135,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Traceable Specification</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CONTEXT__TRACEABLE_SPECIFICATION = eINSTANCE.getContext_TraceableSpecification();
@@ -126,14 +144,17 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Relationship</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CONTEXT__OWNED_RELATIONSHIP = eINSTANCE.getContext_OwnedRelationship();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl <em>Realization</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl <em>Realization</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRealization()
 		 * @generated
@@ -144,6 +165,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Realized</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REALIZATION__REALIZED = eINSTANCE.getRealization_Realized();
@@ -152,6 +174,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Realized By</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REALIZATION__REALIZED_BY = eINSTANCE.getRealization_RealizedBy();
@@ -160,6 +183,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Realization</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REALIZATION__BASE_REALIZATION = eINSTANCE.getRealization_Base_Realization();
@@ -168,6 +192,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Realized By path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REALIZATION__REALIZED_BY_PATH = eINSTANCE.getRealization_RealizedBy_path();
@@ -176,14 +201,17 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Realized path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference REALIZATION__REALIZED_PATH = eINSTANCE.getRealization_Realized_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl <em>Multi Level Reference</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl
+		 * <em>Multi Level Reference</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getMultiLevelReference()
 		 * @generated
@@ -194,6 +222,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY = eINSTANCE.getMultiLevelReference_Base_Dependency();
@@ -202,6 +231,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Referring</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MULTI_LEVEL_REFERENCE__REFERRING = eINSTANCE.getMultiLevelReference_Referring();
@@ -210,6 +240,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MULTI_LEVEL_REFERENCE__REFERENCE = eINSTANCE.getMultiLevelReference_Reference();
@@ -218,6 +249,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RationaleImpl <em>Rationale</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RationaleImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRationale()
 		 * @generated
@@ -228,6 +260,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl <em>EA Package</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAPackage()
 		 * @generated
@@ -238,6 +271,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Sub Packages</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_PACKAGE__SUB_PACKAGES = eINSTANCE.getEAPackage_SubPackages();
@@ -246,6 +280,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_PACKAGE__ELEMENT = eINSTANCE.getEAPackage_Element();
@@ -254,6 +289,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_PACKAGE__BASE_PACKAGE = eINSTANCE.getEAPackage_Base_Package();
@@ -262,6 +298,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl <em>Comment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getComment()
 		 * @generated
@@ -272,6 +309,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Body</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute COMMENT__BODY = eINSTANCE.getComment_Body();
@@ -280,6 +318,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference COMMENT__BASE_COMMENT = eINSTANCE.getComment_Base_Comment();
@@ -288,6 +327,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl <em>EA Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAElement()
 		 * @generated
@@ -298,6 +338,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EA_ELEMENT__NAME = eINSTANCE.getEAElement_Name();
@@ -306,6 +347,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Comment</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_ELEMENT__OWNED_COMMENT = eINSTANCE.getEAElement_OwnedComment();
@@ -314,6 +356,7 @@ public interface ElementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EA_ELEMENT__BASE_NAMED_ELEMENT = eINSTANCE.getEAElement_Base_NamedElement();
@@ -324,6 +367,7 @@ public interface ElementsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "elements";
@@ -332,6 +376,7 @@ public interface ElementsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Infrastructure/Elements/1";
@@ -340,6 +385,7 @@ public interface ElementsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Elements";
@@ -348,6 +394,7 @@ public interface ElementsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	ElementsPackage eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl.init();
@@ -356,6 +403,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl <em>EA Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAElement()
 	 * @generated
@@ -366,6 +414,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -375,6 +424,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -384,6 +434,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -393,15 +444,18 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EA_ELEMENT_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl <em>EA Packageable Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl
+	 * <em>EA Packageable Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAPackageableElement()
 	 * @generated
@@ -412,6 +466,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -421,6 +476,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -430,6 +486,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -439,6 +496,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -448,6 +506,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Packageable Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -457,6 +516,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RelationshipImpl <em>Relationship</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RelationshipImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRelationship()
 	 * @generated
@@ -464,9 +524,11 @@ public interface ElementsPackage extends EPackage {
 	int RELATIONSHIP = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl <em>Traceable Specification</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl
+	 * <em>Traceable Specification</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getTraceableSpecification()
 	 * @generated
@@ -477,6 +539,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -486,6 +549,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -495,6 +559,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -504,6 +569,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -513,6 +579,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -522,6 +589,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Traceable Specification</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -531,6 +599,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +609,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +619,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,6 +629,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Relationship</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -567,6 +639,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl <em>Context</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getContext()
 	 * @generated
@@ -577,6 +650,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl <em>Realization</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRealization()
 	 * @generated
@@ -587,6 +661,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -596,6 +671,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -605,6 +681,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -614,6 +691,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Realized</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -623,6 +701,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Realized By</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -632,6 +711,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Realization</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -641,6 +721,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Realized By path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -650,6 +731,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Realized path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -659,6 +741,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Realization</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -668,6 +751,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -677,6 +761,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -686,6 +771,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -695,6 +781,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -704,6 +791,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -713,15 +801,18 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Context</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CONTEXT_FEATURE_COUNT = EA_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl <em>Multi Level Reference</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl
+	 * <em>Multi Level Reference</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getMultiLevelReference()
 	 * @generated
@@ -732,6 +823,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -741,6 +833,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -750,6 +843,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -759,6 +853,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -768,6 +863,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Referring</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -777,6 +873,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Reference</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -786,6 +883,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Multi Level Reference</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -795,6 +893,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RationaleImpl <em>Rationale</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RationaleImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getRationale()
 	 * @generated
@@ -805,6 +904,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Comment</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -814,6 +914,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Rationale</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -823,6 +924,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl <em>EA Package</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getEAPackage()
 	 * @generated
@@ -833,6 +935,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -842,6 +945,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -851,6 +955,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -860,6 +965,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Sub Packages</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -869,6 +975,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -878,6 +985,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -887,6 +995,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>EA Package</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -896,6 +1005,7 @@ public interface ElementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl <em>Comment</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ElementsPackageImpl#getComment()
 	 * @generated
@@ -906,6 +1016,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Body</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -915,6 +1026,7 @@ public interface ElementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Comment</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -924,6 +1036,7 @@ public interface ElementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Comment</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -933,6 +1046,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context <em>Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Context</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -940,9 +1054,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getContext();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getOwnedRelationship <em>Owned Relationship</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getOwnedRelationship
+	 * <em>Owned Relationship</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Owned Relationship</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getOwnedRelationship()
 	 * @see #getContext()
@@ -951,9 +1067,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getContext_OwnedRelationship();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getTraceableSpecification <em>Traceable Specification</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getTraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Traceable Specification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context#getTraceableSpecification()
 	 * @see #getContext()
@@ -965,15 +1083,18 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	ElementsFactory getElementsFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference <em>Multi Level Reference</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference
+	 * <em>Multi Level Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Multi Level Reference</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference
 	 * @generated
@@ -981,9 +1102,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getMultiLevelReference();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency <em>Base Dependency</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency
+	 * <em>Base Dependency</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Dependency</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency()
 	 * @see #getMultiLevelReference()
@@ -992,9 +1115,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getMultiLevelReference_Base_Dependency();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReference <em>Reference</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReference
+	 * <em>Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Reference</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReference()
 	 * @see #getMultiLevelReference()
@@ -1006,6 +1131,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Rationale <em>Rationale</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Rationale</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Rationale
 	 * @generated
@@ -1016,6 +1142,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage <em>EA Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage
 	 * @generated
@@ -1023,9 +1150,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getEAPackage();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getSubPackages <em>Sub Packages</em>}'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getSubPackages <em>Sub Packages</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Sub Packages</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getSubPackages()
 	 * @see #getEAPackage()
@@ -1034,9 +1163,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getEAPackage_SubPackages();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getElement <em>Element</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getElement
+	 * <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getElement()
 	 * @see #getEAPackage()
@@ -1045,9 +1176,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getEAPackage_Element();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage#getBase_Package()
 	 * @see #getEAPackage()
@@ -1059,6 +1192,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment <em>Comment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Comment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Comment
 	 * @generated
@@ -1069,6 +1203,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBody <em>Body</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Body</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBody()
 	 * @see #getComment()
@@ -1077,9 +1212,11 @@ public interface ElementsPackage extends EPackage {
 	EAttribute getComment_Body();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment <em>Base Comment</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment
+	 * <em>Base Comment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Comment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Comment#getBase_Comment()
 	 * @see #getComment()
@@ -1091,6 +1228,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement <em>EA Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -1101,6 +1239,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getName()
 	 * @see #getEAElement()
@@ -1109,9 +1248,11 @@ public interface ElementsPackage extends EPackage {
 	EAttribute getEAElement_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement <em>Base Named Element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement
+	 * <em>Base Named Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Named Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getBase_NamedElement()
 	 * @see #getEAElement()
@@ -1120,9 +1261,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getEAElement_Base_NamedElement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getOwnedComment <em>Owned Comment</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getOwnedComment
+	 * <em>Owned Comment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Owned Comment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement#getOwnedComment()
 	 * @see #getEAElement()
@@ -1131,9 +1274,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getEAElement_OwnedComment();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReferring <em>Referring</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReferring
+	 * <em>Referring</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Referring</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReferring()
 	 * @see #getMultiLevelReference()
@@ -1145,6 +1290,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization <em>Realization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Realization</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization
 	 * @generated
@@ -1152,9 +1298,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getRealization();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized <em>Realized</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized
+	 * <em>Realized</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Realized</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized()
 	 * @see #getRealization()
@@ -1163,9 +1311,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getRealization_Realized();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy <em>Realized By</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy
+	 * <em>Realized By</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Realized By</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy()
 	 * @see #getRealization()
@@ -1174,9 +1324,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getRealization_RealizedBy();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization <em>Base Realization</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization
+	 * <em>Base Realization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Realization</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization()
 	 * @see #getRealization()
@@ -1185,9 +1337,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getRealization_Base_Realization();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy_path <em>Realized By path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy_path
+	 * <em>Realized By path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Realized By path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy_path()
 	 * @see #getRealization()
@@ -1196,9 +1350,11 @@ public interface ElementsPackage extends EPackage {
 	EReference getRealization_RealizedBy_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized_path <em>Realized path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized_path
+	 * <em>Realized path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Realized path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized_path()
 	 * @see #getRealization()
@@ -1210,6 +1366,7 @@ public interface ElementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship <em>Relationship</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Relationship</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship
 	 * @generated
@@ -1217,9 +1374,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getRelationship();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Traceable Specification</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -1227,9 +1386,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getTraceableSpecification();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote <em>Note</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote
+	 * <em>Note</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Note</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote()
 	 * @see #getTraceableSpecification()
@@ -1238,9 +1399,11 @@ public interface ElementsPackage extends EPackage {
 	EAttribute getTraceableSpecification_Note();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>EA Packageable Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -1248,9 +1411,11 @@ public interface ElementsPackage extends EPackage {
 	EClass getEAPackageableElement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement <em>Base Packageable Element</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement <em>Base Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Packageable Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement#getBase_PackageableElement()
 	 * @see #getEAPackageableElement()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/MultiLevelReference.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/MultiLevelReference.java
index 7336bb717e1..fac0b61a796 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/MultiLevelReference.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/MultiLevelReference.java
@@ -21,33 +21,34 @@ import org.eclipse.uml2.uml.Dependency;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Multi Level Reference</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * MultiLevelReference gives the possibility to establish reference links (Multi-Level Concept) between model elements.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReferring <em>Referring</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReferring <em>Referring</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getMultiLevelReference()
  * @model
  * @generated
  */
 public interface MultiLevelReference extends Relationship {
+
 	/**
 	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Dependency</em>' reference.
 	 * @see #setBase_Dependency(Dependency)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getMultiLevelReference_Base_Dependency()
@@ -57,10 +58,13 @@ public interface MultiLevelReference extends Relationship {
 	Dependency getBase_Dependency();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency <em>Base Dependency</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference#getBase_Dependency
+	 * <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Dependency</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Dependency</em>' reference.
 	 * @see #getBase_Dependency()
 	 * @generated
 	 */
@@ -73,6 +77,7 @@ public interface MultiLevelReference extends Relationship {
 	 * <!-- begin-model-doc -->
 	 * Referencing the source element of a Multi-Level reference link.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Reference</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getMultiLevelReference_Reference()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -87,6 +92,7 @@ public interface MultiLevelReference extends Relationship {
 	 * <!-- begin-model-doc -->
 	 * Referencing the target element of a Multi-Level reference link.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Referring</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getMultiLevelReference_Referring()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Rationale.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Rationale.java
index 907c3ee980f..81a6aa06e1b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Rationale.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Rationale.java
@@ -20,8 +20,8 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Rationale</b></em>'.

  * <!-- end-user-doc -->

- *

- *

+ * 

+ * 

  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRationale()

  * @model

  * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Realization.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Realization.java
index 9cf9fe06764..ffca3583158 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Realization.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Realization.java
@@ -22,41 +22,45 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Realization</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Realization is a relationship which relates two or more elements across boundaries of the EAST-ADL2 abstraction levels. 
+ * The Realization is a relationship which relates two or more elements across boundaries of the EAST-ADL2 abstraction levels.
  * 
- * It identifies an element that serves as a specification within this realization relationship and on the other side it identifies an element that is supposed to realize this specification on a lower abstraction level or an implementation.
+ * It identifies an element that serves as a specification within this realization relationship and on the other side it identifies an element that is
+ * supposed to realize this specification on a lower abstraction level or an implementation.
  * 
  * 
  * Semantics:
- * The modification of the supplier realized element impact the realizing client entity. The Realization metaclass implies the semantics that the realizing client is not complete, without the supplier.
+ * The modification of the supplier realized element impact the realizing client entity. The Realization metaclass implies the semantics that the
+ * realizing client is not complete, without the supplier.
  * 
  * Notation:
- * A Realization relationship is shown as a dashed line with a triangular arrowhead at the end that corresponds to the realized entity. The entity at the tail of the arrow (the realizing EAElement or the realizing ARElement) depends on the entity at the arrowhead (the realized EAElement).
+ * A Realization relationship is shown as a dashed line with a triangular arrowhead at the end that corresponds to the realized entity. The entity at
+ * the tail of the arrow (the realizing EAElement or the realizing ARElement) depends on the entity at the arrowhead (the realized EAElement).
  * 
  * Changes:
  * Renamed from Realization.
  * 
  * Extension: Realization
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized <em>Realized</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy <em>Realized By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization <em>Base Realization</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy_path <em>Realized By path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized_path <em>Realized path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized <em>Realized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy <em>Realized By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization <em>Base Realization</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealizedBy_path <em>Realized By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getRealized_path <em>Realized path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization()
  * @model
  * @generated
  */
 public interface Realization extends Relationship {
+
 	/**
 	 * Returns the value of the '<em><b>Realized</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement}.
@@ -66,6 +70,7 @@ public interface Realization extends Relationship {
 	 * The set of ADL entities, which are realized by the set of client ADL entities or realized by the set of client AUTOSAR elements.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Realized</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization_Realized()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -82,6 +87,7 @@ public interface Realization extends Relationship {
 	 * The set of client ADL entities, realizing the set of supplier ADL entities.
 	 * {derived from UML::Dependency::client}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Realized By</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization_RealizedBy()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -93,10 +99,10 @@ public interface Realization extends Relationship {
 	 * Returns the value of the '<em><b>Base Realization</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Realization</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Realization</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Realization</em>' reference.
 	 * @see #setBase_Realization(org.eclipse.uml2.uml.Realization)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization_Base_Realization()
@@ -106,10 +112,13 @@ public interface Realization extends Relationship {
 	org.eclipse.uml2.uml.Realization getBase_Realization();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization <em>Base Realization</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.Realization#getBase_Realization <em>Base Realization</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Realization</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Realization</em>' reference.
 	 * @see #getBase_Realization()
 	 * @generated
 	 */
@@ -120,10 +129,10 @@ public interface Realization extends Relationship {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Realized By path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Realized By path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Realized By path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization_RealizedBy_path()
 	 * @model
@@ -136,10 +145,10 @@ public interface Realization extends Relationship {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Realized path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Realized path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Realized path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRealization_Realized_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Relationship.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Relationship.java
index dbb7618c09f..9c206f343a6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Relationship.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/Relationship.java
@@ -20,12 +20,14 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Relationship</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The Relationship is an abstract metaclass which represents a relationship between arbitrary elements.
  * 
  * Semantics:
- * In many cases, Contexts such as functions and sensors need to have requirements and other specification elements allocated them. In other cases, the relation between an element and the related specification element is specific for a certain Context: for example a Requirement on a sensor is only applicable in certain hardware architecture. These relationships are modeled by concrete specializations of Relationship.
+ * In many cases, Contexts such as functions and sensors need to have requirements and other specification elements allocated them. In other cases,
+ * the relation between an element and the related specification element is specific for a certain Context: for example a Requirement on a sensor is
+ * only applicable in certain hardware architecture. These relationships are modeled by concrete specializations of Relationship.
  * 
  * See Context and TraceableSpecification.
  * 
@@ -33,11 +35,11 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements;
  * Changes:
  * New class in EAST-ADL2
  * 
- * Extension: 
+ * Extension:
  * The Relationship stereotype is abstract
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getRelationship()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/TraceableSpecification.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/TraceableSpecification.java
index 6393c9e7cfa..4016eafa027 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/TraceableSpecification.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/TraceableSpecification.java
@@ -20,12 +20,13 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Traceable Specification</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The TraceableSpecification is an abstract metaclass which is used to allow its specializations to be allocated to a Context. 
+ * The TraceableSpecification is an abstract metaclass which is used to allow its specializations to be allocated to a Context.
  * 
  * Semantics:
- * TraceableSpecification is specialized by requirements, test cases and other specifications, that there by can be allocated to a Context, for example to a sensor or to an entire HW architecture.
+ * TraceableSpecification is specialized by requirements, test cases and other specifications, that there by can be allocated to a Context, for
+ * example to a sensor or to an entire HW architecture.
  * 
  * See Context and Relationship.
  * 
@@ -33,30 +34,31 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements;
  * Changes:
  * New class in EAST-ADL2
  * 
- * Extension: 
+ * Extension:
  * TraceableSpecification is a specification stereotype which extends UML2 PackageableElement
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote <em>Note</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote <em>Note</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getTraceableSpecification()
  * @model abstract="true"
  * @generated
  */
 public interface TraceableSpecification extends EAPackageableElement {
+
 	/**
 	 * Returns the value of the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Note</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Note</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Note</em>' attribute.
 	 * @see #setNote(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#getTraceableSpecification_Note()
@@ -69,7 +71,9 @@ public interface TraceableSpecification extends EAPackageableElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification#getNote <em>Note</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Note</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Note</em>' attribute.
 	 * @see #getNote()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/CommentImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/CommentImpl.java
index 42d7d6715d8..1dc3ea38203 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/CommentImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/CommentImpl.java
@@ -30,18 +30,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl#getBody <em>Body</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl#getBase_Comment <em>Base Comment</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl#getBody <em>Body</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.CommentImpl#getBase_Comment <em>Base Comment</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class CommentImpl extends EObjectImpl implements Comment {

+

 	/**

 	 * The default value of the '{@link #getBody() <em>Body</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBody()

 	 * @generated

 	 * @ordered

@@ -52,6 +54,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	 * The cached value of the '{@link #getBody() <em>Body</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBody()

 	 * @generated

 	 * @ordered

@@ -62,6 +65,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	 * The cached value of the '{@link #getBase_Comment() <em>Base Comment</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Comment()

 	 * @generated

 	 * @ordered

@@ -71,6 +75,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected CommentImpl() {

@@ -80,6 +85,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -90,6 +96,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getBody() {

@@ -99,26 +106,28 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBody(String newBody) {

 		String oldBody = body;

 		body = newBody;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.COMMENT__BODY, oldBody, body));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Comment getBase_Comment() {

-		if (base_Comment != null && base_Comment.eIsProxy()) {

+		if(base_Comment != null && base_Comment.eIsProxy()) {

 			InternalEObject oldBase_Comment = (InternalEObject)base_Comment;

 			base_Comment = (org.eclipse.uml2.uml.Comment)eResolveProxy(oldBase_Comment);

-			if (base_Comment != oldBase_Comment) {

-				if (eNotificationRequired())

+			if(base_Comment != oldBase_Comment) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.COMMENT__BASE_COMMENT, oldBase_Comment, base_Comment));

 			}

 		}

@@ -128,6 +137,7 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Comment basicGetBase_Comment() {

@@ -137,28 +147,31 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Comment(org.eclipse.uml2.uml.Comment newBase_Comment) {

 		org.eclipse.uml2.uml.Comment oldBase_Comment = base_Comment;

 		base_Comment = newBase_Comment;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.COMMENT__BASE_COMMENT, oldBase_Comment, base_Comment));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case ElementsPackage.COMMENT__BODY:

-				return getBody();

-			case ElementsPackage.COMMENT__BASE_COMMENT:

-				if (resolve) return getBase_Comment();

-				return basicGetBase_Comment();

+		switch(featureID) {

+		case ElementsPackage.COMMENT__BODY:

+			return getBody();

+		case ElementsPackage.COMMENT__BASE_COMMENT:

+			if(resolve)

+				return getBase_Comment();

+			return basicGetBase_Comment();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -166,17 +179,18 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case ElementsPackage.COMMENT__BODY:

-				setBody((String)newValue);

-				return;

-			case ElementsPackage.COMMENT__BASE_COMMENT:

-				setBase_Comment((org.eclipse.uml2.uml.Comment)newValue);

-				return;

+		switch(featureID) {

+		case ElementsPackage.COMMENT__BODY:

+			setBody((String)newValue);

+			return;

+		case ElementsPackage.COMMENT__BASE_COMMENT:

+			setBase_Comment((org.eclipse.uml2.uml.Comment)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -184,17 +198,18 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.COMMENT__BODY:

-				setBody(BODY_EDEFAULT);

-				return;

-			case ElementsPackage.COMMENT__BASE_COMMENT:

-				setBase_Comment((org.eclipse.uml2.uml.Comment)null);

-				return;

+		switch(featureID) {

+		case ElementsPackage.COMMENT__BODY:

+			setBody(BODY_EDEFAULT);

+			return;

+		case ElementsPackage.COMMENT__BASE_COMMENT:

+			setBase_Comment((org.eclipse.uml2.uml.Comment)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -202,15 +217,16 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.COMMENT__BODY:

-				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);

-			case ElementsPackage.COMMENT__BASE_COMMENT:

-				return base_Comment != null;

+		switch(featureID) {

+		case ElementsPackage.COMMENT__BODY:

+			return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);

+		case ElementsPackage.COMMENT__BASE_COMMENT:

+			return base_Comment != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -218,11 +234,13 @@ public class CommentImpl extends EObjectImpl implements Comment {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (body: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ContextImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ContextImpl.java
index bf2aefac6b8..584fc6cd435 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ContextImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ContextImpl.java
@@ -33,18 +33,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl#getTraceableSpecification <em>Traceable Specification</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl#getOwnedRelationship <em>Owned Relationship</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl#getTraceableSpecification <em>Traceable Specification</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.ContextImpl#getOwnedRelationship <em>Owned Relationship</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ContextImpl extends EAElementImpl implements Context {
+
 	/**
 	 * The cached value of the '{@link #getTraceableSpecification() <em>Traceable Specification</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTraceableSpecification()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	 * The cached value of the '{@link #getOwnedRelationship() <em>Owned Relationship</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedRelationship()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ContextImpl() {
@@ -73,15 +77,16 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
-				return getTraceableSpecification();
-			case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
-				return getOwnedRelationship();
+		switch(featureID) {
+		case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
+			return getTraceableSpecification();
+		case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
+			return getOwnedRelationship();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -89,15 +94,16 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
-				return traceableSpecification != null && !traceableSpecification.isEmpty();
-			case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
-				return ownedRelationship != null && !ownedRelationship.isEmpty();
+		switch(featureID) {
+		case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
+			return traceableSpecification != null && !traceableSpecification.isEmpty();
+		case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
+			return ownedRelationship != null && !ownedRelationship.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -105,20 +111,21 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
-				getTraceableSpecification().clear();
-				getTraceableSpecification().addAll((Collection<? extends TraceableSpecification>)newValue);
-				return;
-			case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
-				getOwnedRelationship().clear();
-				getOwnedRelationship().addAll((Collection<? extends Relationship>)newValue);
-				return;
+		switch(featureID) {
+		case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
+			getTraceableSpecification().clear();
+			getTraceableSpecification().addAll((Collection<? extends TraceableSpecification>)newValue);
+			return;
+		case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
+			getOwnedRelationship().clear();
+			getOwnedRelationship().addAll((Collection<? extends Relationship>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -126,6 +133,7 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,17 +144,18 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
-				getTraceableSpecification().clear();
-				return;
-			case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
-				getOwnedRelationship().clear();
-				return;
+		switch(featureID) {
+		case ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION:
+			getTraceableSpecification().clear();
+			return;
+		case ElementsPackage.CONTEXT__OWNED_RELATIONSHIP:
+			getOwnedRelationship().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -154,10 +163,11 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Relationship> getOwnedRelationship() {
-		if (ownedRelationship == null) {
+		if(ownedRelationship == null) {
 			ownedRelationship = new EObjectResolvingEList<Relationship>(Relationship.class, this, ElementsPackage.CONTEXT__OWNED_RELATIONSHIP);
 		}
 		return ownedRelationship;
@@ -166,10 +176,11 @@ public abstract class ContextImpl extends EAElementImpl implements Context {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TraceableSpecification> getTraceableSpecification() {
-		if (traceableSpecification == null) {
+		if(traceableSpecification == null) {
 			traceableSpecification = new EObjectResolvingEList<TraceableSpecification>(TraceableSpecification.class, this, ElementsPackage.CONTEXT__TRACEABLE_SPECIFICATION);
 		}
 		return traceableSpecification;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAElementImpl.java
index 0a32ca8783e..a1fc737f6ac 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAElementImpl.java
@@ -36,12 +36,12 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getOwnedComment <em>Owned Comment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAElementImpl#getOwnedComment <em>Owned Comment</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class EAElementImpl extends EObjectImpl implements EAElement {
@@ -50,6 +50,7 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -60,6 +61,7 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	/**
 	 * The cached value of the '{@link #getOwnedComment() <em>Owned Comment</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedComment()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EAElementImpl() {
@@ -85,63 +89,68 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ElementsPackage.EA_ELEMENT__NAME:
-				return getName();
-			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
-				if (resolve) return getBase_NamedElement();
-				return basicGetBase_NamedElement();
-			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
-				return getOwnedComment();
+		switch(featureID) {
+		case ElementsPackage.EA_ELEMENT__NAME:
+			return getName();
+		case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+			if(resolve)
+				return getBase_NamedElement();
+			return basicGetBase_NamedElement();
+		case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+			return getOwnedComment();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.EA_ELEMENT__NAME:
-				return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
-			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
-				return base_NamedElement != null;
-			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
-				return ownedComment != null && !ownedComment.isEmpty();
+		switch(featureID) {
+		case ElementsPackage.EA_ELEMENT__NAME:
+			return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
+		case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+			return base_NamedElement != null;
+		case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+			return ownedComment != null && !ownedComment.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ElementsPackage.EA_ELEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)newValue);
-				return;
-			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				getOwnedComment().addAll((Collection<? extends Comment>)newValue);
-				return;
+		switch(featureID) {
+		case ElementsPackage.EA_ELEMENT__NAME:
+			setName((String)newValue);
+			return;
+		case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)newValue);
+			return;
+		case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			getOwnedComment().addAll((Collection<? extends Comment>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,20 +160,21 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.EA_ELEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)null);
-				return;
-			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				return;
+		switch(featureID) {
+		case ElementsPackage.EA_ELEMENT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)null);
+			return;
+		case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -190,10 +200,11 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getOwnedComment() {
-		if (ownedComment == null) {
+		if(ownedComment == null) {
 			ownedComment = new EObjectResolvingEList<Comment>(Comment.class, this, ElementsPackage.EA_ELEMENT__OWNED_COMMENT);
 		}
 		return ownedComment;
@@ -202,14 +213,15 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getBase_NamedElement() {
-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {
+		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {
 			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;
 			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);
-			if (base_NamedElement != oldBase_NamedElement) {
-				if (eNotificationRequired())
+			if(base_NamedElement != oldBase_NamedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 			}
 		}
@@ -219,6 +231,7 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetBase_NamedElement() {
@@ -228,12 +241,13 @@ public abstract class EAElementImpl extends EObjectImpl implements EAElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {
 		NamedElement oldBase_NamedElement = base_NamedElement;
 		base_NamedElement = newBase_NamedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageImpl.java
index c2ba2cb6a74..20851c2a0bd 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageImpl.java
@@ -36,12 +36,12 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getSubPackages <em>Sub Packages</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getElement <em>Element</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getSubPackages <em>Sub Packages</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageImpl#getBase_Package <em>Base Package</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class EAPackageImpl extends EAElementImpl implements EAPackage {

@@ -50,6 +50,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	 * The cached value of the '{@link #getSubPackages() <em>Sub Packages</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getSubPackages()

 	 * @generated

 	 * @ordered

@@ -60,6 +61,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -70,6 +72,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Package()

 	 * @generated

 	 * @ordered

@@ -79,6 +82,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected EAPackageImpl() {

@@ -88,6 +92,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -98,10 +103,11 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<EAPackage> getSubPackages() {

-		if (subPackages == null) {

+		if(subPackages == null) {

 			subPackages = new EObjectContainmentEList<EAPackage>(EAPackage.class, this, ElementsPackage.EA_PACKAGE__SUB_PACKAGES);

 		}

 		return subPackages;

@@ -110,10 +116,11 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<EAPackageableElement> getElement() {

-		if (element == null) {

+		if(element == null) {

 			element = new EObjectContainmentEList<EAPackageableElement>(EAPackageableElement.class, this, ElementsPackage.EA_PACKAGE__ELEMENT);

 		}

 		return element;

@@ -122,14 +129,15 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package getBase_Package() {

-		if (base_Package != null && base_Package.eIsProxy()) {

+		if(base_Package != null && base_Package.eIsProxy()) {

 			InternalEObject oldBase_Package = (InternalEObject)base_Package;

 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);

-			if (base_Package != oldBase_Package) {

-				if (eNotificationRequired())

+			if(base_Package != oldBase_Package) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.EA_PACKAGE__BASE_PACKAGE, oldBase_Package, base_Package));

 			}

 		}

@@ -139,6 +147,7 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

@@ -148,27 +157,29 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

 		base_Package = newBase_Package;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.EA_PACKAGE__BASE_PACKAGE, oldBase_Package, base_Package));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

-				return ((InternalEList<?>)getSubPackages()).basicRemove(otherEnd, msgs);

-			case ElementsPackage.EA_PACKAGE__ELEMENT:

-				return ((InternalEList<?>)getElement()).basicRemove(otherEnd, msgs);

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

+			return ((InternalEList<?>)getSubPackages()).basicRemove(otherEnd, msgs);

+		case ElementsPackage.EA_PACKAGE__ELEMENT:

+			return ((InternalEList<?>)getElement()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -176,18 +187,20 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

-				return getSubPackages();

-			case ElementsPackage.EA_PACKAGE__ELEMENT:

-				return getElement();

-			case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

-				if (resolve) return getBase_Package();

-				return basicGetBase_Package();

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

+			return getSubPackages();

+		case ElementsPackage.EA_PACKAGE__ELEMENT:

+			return getElement();

+		case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

+			if(resolve)

+				return getBase_Package();

+			return basicGetBase_Package();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -195,23 +208,24 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

-				getSubPackages().clear();

-				getSubPackages().addAll((Collection<? extends EAPackage>)newValue);

-				return;

-			case ElementsPackage.EA_PACKAGE__ELEMENT:

-				getElement().clear();

-				getElement().addAll((Collection<? extends EAPackageableElement>)newValue);

-				return;

-			case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);

-				return;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

+			getSubPackages().clear();

+			getSubPackages().addAll((Collection<? extends EAPackage>)newValue);

+			return;

+		case ElementsPackage.EA_PACKAGE__ELEMENT:

+			getElement().clear();

+			getElement().addAll((Collection<? extends EAPackageableElement>)newValue);

+			return;

+		case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -219,20 +233,21 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

-				getSubPackages().clear();

-				return;

-			case ElementsPackage.EA_PACKAGE__ELEMENT:

-				getElement().clear();

-				return;

-			case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)null);

-				return;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

+			getSubPackages().clear();

+			return;

+		case ElementsPackage.EA_PACKAGE__ELEMENT:

+			getElement().clear();

+			return;

+		case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -240,17 +255,18 @@ public class EAPackageImpl extends EAElementImpl implements EAPackage {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

-				return subPackages != null && !subPackages.isEmpty();

-			case ElementsPackage.EA_PACKAGE__ELEMENT:

-				return element != null && !element.isEmpty();

-			case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

-				return base_Package != null;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGE__SUB_PACKAGES:

+			return subPackages != null && !subPackages.isEmpty();

+		case ElementsPackage.EA_PACKAGE__ELEMENT:

+			return element != null && !element.isEmpty();

+		case ElementsPackage.EA_PACKAGE__BASE_PACKAGE:

+			return base_Package != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageableElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageableElementImpl.java
index 4ffc586ec03..dc88e5d19f1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageableElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/EAPackageableElementImpl.java
@@ -30,17 +30,20 @@ import org.eclipse.uml2.uml.PackageableElement;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl#getBase_PackageableElement <em>Base Packageable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.EAPackageableElementImpl#getBase_PackageableElement <em>Base Packageable

+ * Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public abstract class EAPackageableElementImpl extends EAElementImpl implements EAPackageableElement {

+

 	/**

 	 * The cached value of the '{@link #getBase_PackageableElement() <em>Base Packageable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_PackageableElement()

 	 * @generated

 	 * @ordered

@@ -50,6 +53,7 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected EAPackageableElementImpl() {

@@ -59,6 +63,7 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,14 +74,15 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public PackageableElement getBase_PackageableElement() {

-		if (base_PackageableElement != null && base_PackageableElement.eIsProxy()) {

+		if(base_PackageableElement != null && base_PackageableElement.eIsProxy()) {

 			InternalEObject oldBase_PackageableElement = (InternalEObject)base_PackageableElement;

 			base_PackageableElement = (PackageableElement)eResolveProxy(oldBase_PackageableElement);

-			if (base_PackageableElement != oldBase_PackageableElement) {

-				if (eNotificationRequired())

+			if(base_PackageableElement != oldBase_PackageableElement) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT, oldBase_PackageableElement, base_PackageableElement));

 			}

 		}

@@ -86,6 +92,7 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public PackageableElement basicGetBase_PackageableElement() {

@@ -95,26 +102,29 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_PackageableElement(PackageableElement newBase_PackageableElement) {

 		PackageableElement oldBase_PackageableElement = base_PackageableElement;

 		base_PackageableElement = newBase_PackageableElement;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT, oldBase_PackageableElement, base_PackageableElement));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

-				if (resolve) return getBase_PackageableElement();

-				return basicGetBase_PackageableElement();

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

+			if(resolve)

+				return getBase_PackageableElement();

+			return basicGetBase_PackageableElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -122,14 +132,15 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

-				setBase_PackageableElement((PackageableElement)newValue);

-				return;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

+			setBase_PackageableElement((PackageableElement)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -137,14 +148,15 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

-				setBase_PackageableElement((PackageableElement)null);

-				return;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

+			setBase_PackageableElement((PackageableElement)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,13 +164,14 @@ public abstract class EAPackageableElementImpl extends EAElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

-				return base_PackageableElement != null;

+		switch(featureID) {

+		case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:

+			return base_PackageableElement != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsFactoryImpl.java
index c8907ba2bd4..9d9c658836e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.infrastructure.elements.*;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Comment;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsFactory;
@@ -33,12 +34,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Realization;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -51,16 +55,16 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ElementsFactory init() {
 		try {
 			ElementsFactory theElementsFactory = (ElementsFactory)EPackage.Registry.INSTANCE.getEFactory(ElementsPackage.eNS_URI);
-			if (theElementsFactory != null) {
+			if(theElementsFactory != null) {
 				return theElementsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ElementsFactoryImpl();
@@ -70,6 +74,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsFactoryImpl() {
@@ -79,24 +84,31 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ElementsPackage.REALIZATION: return createRealization();
-			case ElementsPackage.MULTI_LEVEL_REFERENCE: return createMultiLevelReference();
-			case ElementsPackage.RATIONALE: return createRationale();
-			case ElementsPackage.EA_PACKAGE: return createEAPackage();
-			case ElementsPackage.COMMENT: return createComment();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case ElementsPackage.REALIZATION:
+			return createRealization();
+		case ElementsPackage.MULTI_LEVEL_REFERENCE:
+			return createMultiLevelReference();
+		case ElementsPackage.RATIONALE:
+			return createRationale();
+		case ElementsPackage.EA_PACKAGE:
+			return createEAPackage();
+		case ElementsPackage.COMMENT:
+			return createComment();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MultiLevelReference createMultiLevelReference() {
@@ -107,6 +119,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Rationale createRationale() {
@@ -117,6 +130,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAPackage createEAPackage() {
@@ -127,6 +141,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Comment createComment() {
@@ -137,6 +152,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Realization createRealization() {
@@ -147,6 +163,7 @@ public class ElementsFactoryImpl extends EFactoryImpl implements ElementsFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsPackage getElementsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsPackageImpl.java
index c2160e02145..3f7e757e5bf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/ElementsPackageImpl.java
@@ -96,6 +96,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage {
@@ -103,6 +104,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass relationshipEClass = null;
@@ -110,6 +112,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass traceableSpecificationEClass = null;
@@ -117,6 +120,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaPackageableElementEClass = null;
@@ -124,6 +128,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass contextEClass = null;
@@ -131,6 +136,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass realizationEClass = null;
@@ -138,6 +144,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass multiLevelReferenceEClass = null;
@@ -145,6 +152,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rationaleEClass = null;
@@ -152,6 +160,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaPackageEClass = null;
@@ -159,6 +168,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass commentEClass = null;
@@ -166,6 +176,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eaElementEClass = null;
@@ -173,6 +184,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -180,16 +192,18 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * 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 ElementsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link ElementsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static ElementsPackage init() {
-		if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI);
+		if(isInited)
+			return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl());
@@ -291,7 +305,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 		// Mark meta-data to indicate it can't be changed
 		theElementsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage);
 		return theElementsPackage;
@@ -300,6 +314,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -307,19 +322,19 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage#eNS_URI
 	 * @see #init()
@@ -330,14 +345,16 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -385,6 +402,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getContext() {
@@ -394,6 +412,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getContext_OwnedRelationship() {
@@ -403,6 +422,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getContext_TraceableSpecification() {
@@ -412,6 +432,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsFactory getElementsFactory() {
@@ -421,6 +442,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMultiLevelReference() {
@@ -430,6 +452,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMultiLevelReference_Base_Dependency() {
@@ -439,6 +462,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMultiLevelReference_Reference() {
@@ -448,6 +472,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRationale() {
@@ -457,6 +482,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAPackage() {
@@ -466,6 +492,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAPackage_SubPackages() {
@@ -475,6 +502,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAPackage_Element() {
@@ -484,6 +512,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAPackage_Base_Package() {
@@ -493,6 +522,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getComment() {
@@ -502,6 +532,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getComment_Body() {
@@ -511,6 +542,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getComment_Base_Comment() {
@@ -520,6 +552,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAElement() {
@@ -529,6 +562,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEAElement_Name() {
@@ -538,6 +572,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAElement_Base_NamedElement() {
@@ -547,6 +582,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAElement_OwnedComment() {
@@ -556,6 +592,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMultiLevelReference_Referring() {
@@ -565,6 +602,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRealization() {
@@ -574,6 +612,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRealization_Realized() {
@@ -583,6 +622,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRealization_RealizedBy() {
@@ -592,6 +632,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRealization_Base_Realization() {
@@ -601,6 +642,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRealization_RealizedBy_path() {
@@ -610,6 +652,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRealization_Realized_path() {
@@ -619,6 +662,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRelationship() {
@@ -628,6 +672,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTraceableSpecification() {
@@ -637,6 +682,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTraceableSpecification_Note() {
@@ -646,6 +692,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEAPackageableElement() {
@@ -655,6 +702,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEAPackageableElement_Base_PackageableElement() {
@@ -662,14 +710,16 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/MultiLevelReferenceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/MultiLevelReferenceImpl.java
index 54041eff63c..1755b12118f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/MultiLevelReferenceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/MultiLevelReferenceImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getReferring <em>Referring</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getReferring <em>Referring</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.MultiLevelReferenceImpl#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLevelReference {
@@ -46,13 +46,16 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Dependency()
 	 * @generated
 	 * @ordered
 	 */
 	protected Dependency base_Dependency;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MultiLevelReferenceImpl() {
@@ -95,57 +98,64 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
-				if (resolve) return getBase_Dependency();
-				return basicGetBase_Dependency();
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERRING:
-				if (resolve) return getReferring();
-				return basicGetReferring();
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERENCE:
-				if (resolve) return getReference();
-				return basicGetReference();
+		switch(featureID) {
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
+			if(resolve)
+				return getBase_Dependency();
+			return basicGetBase_Dependency();
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERRING:
+			if(resolve)
+				return getReferring();
+			return basicGetReferring();
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERENCE:
+			if(resolve)
+				return getReference();
+			return basicGetReference();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
-				return base_Dependency != null;
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERRING:
-				return basicGetReferring() != null;
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERENCE:
-				return basicGetReference() != null;
+		switch(featureID) {
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
+			return base_Dependency != null;
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERRING:
+			return basicGetReferring() != null;
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__REFERENCE:
+			return basicGetReference() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)newValue);
-				return;
+		switch(featureID) {
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,14 +166,15 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency getBase_Dependency() {
-		if (base_Dependency != null && base_Dependency.eIsProxy()) {
+		if(base_Dependency != null && base_Dependency.eIsProxy()) {
 			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;
 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);
-			if (base_Dependency != oldBase_Dependency) {
-				if (eNotificationRequired())
+			if(base_Dependency != oldBase_Dependency) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 			}
 		}
@@ -173,6 +184,7 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency basicGetBase_Dependency() {
@@ -182,31 +194,34 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Dependency(Dependency newBase_Dependency) {
 		Dependency oldBase_Dependency = base_Dependency;
 		base_Dependency = newBase_Dependency;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)null);
-				return;
+		switch(featureID) {
+		case ElementsPackage.MULTI_LEVEL_REFERENCE__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAElement getReference() {
@@ -216,6 +231,7 @@ public class MultiLevelReferenceImpl extends RelationshipImpl implements MultiLe
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAElement getReferring() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RationaleImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RationaleImpl.java
index 5100f1274bb..2a59e58948a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RationaleImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RationaleImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Rationale;
  * <!-- end-user-doc -->

  * <p>

  * </p>

- *

+ * 

  * @generated

  */

 public class RationaleImpl extends org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl implements Rationale {

@@ -33,6 +33,7 @@ public class RationaleImpl extends org.eclipse.papyrus.sysml.modelelements.inter
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected RationaleImpl() {

@@ -42,6 +43,7 @@ public class RationaleImpl extends org.eclipse.papyrus.sysml.modelelements.inter
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RealizationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RealizationImpl.java
index 324d04c62cb..038d9bad4a7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RealizationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RealizationImpl.java
@@ -40,14 +40,14 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealized <em>Realized</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealizedBy <em>Realized By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getBase_Realization <em>Base Realization</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealizedBy_path <em>Realized By path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealized_path <em>Realized path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealized <em>Realized</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealizedBy <em>Realized By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getBase_Realization <em>Base Realization</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealizedBy_path <em>Realized By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.RealizationImpl#getRealized_path <em>Realized path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RealizationImpl extends RelationshipImpl implements Realization {
@@ -56,6 +56,7 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	 * The cached value of the '{@link #getBase_Realization() <em>Base Realization</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Realization()
 	 * @generated
 	 * @ordered
@@ -66,6 +67,7 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	 * The cached value of the '{@link #getRealizedBy_path() <em>Realized By path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRealizedBy_path()
 	 * @generated
 	 * @ordered
@@ -76,6 +78,7 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	 * The cached value of the '{@link #getRealized_path() <em>Realized path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRealized_path()
 	 * @generated
 	 * @ordered
@@ -84,6 +87,7 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RealizationImpl() {
@@ -92,72 +96,77 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ElementsPackage.REALIZATION__REALIZED:
-				return getRealized();
-			case ElementsPackage.REALIZATION__REALIZED_BY:
-				return getRealizedBy();
-			case ElementsPackage.REALIZATION__BASE_REALIZATION:
-				if (resolve) return getBase_Realization();
-				return basicGetBase_Realization();
-			case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
-				return getRealizedBy_path();
-			case ElementsPackage.REALIZATION__REALIZED_PATH:
-				return getRealized_path();
+		switch(featureID) {
+		case ElementsPackage.REALIZATION__REALIZED:
+			return getRealized();
+		case ElementsPackage.REALIZATION__REALIZED_BY:
+			return getRealizedBy();
+		case ElementsPackage.REALIZATION__BASE_REALIZATION:
+			if(resolve)
+				return getBase_Realization();
+			return basicGetBase_Realization();
+		case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
+			return getRealizedBy_path();
+		case ElementsPackage.REALIZATION__REALIZED_PATH:
+			return getRealized_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.REALIZATION__REALIZED:
-				return !getRealized().isEmpty();
-			case ElementsPackage.REALIZATION__REALIZED_BY:
-				return !getRealizedBy().isEmpty();
-			case ElementsPackage.REALIZATION__BASE_REALIZATION:
-				return base_Realization != null;
-			case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
-				return realizedBy_path != null && !realizedBy_path.isEmpty();
-			case ElementsPackage.REALIZATION__REALIZED_PATH:
-				return realized_path != null && !realized_path.isEmpty();
+		switch(featureID) {
+		case ElementsPackage.REALIZATION__REALIZED:
+			return !getRealized().isEmpty();
+		case ElementsPackage.REALIZATION__REALIZED_BY:
+			return !getRealizedBy().isEmpty();
+		case ElementsPackage.REALIZATION__BASE_REALIZATION:
+			return base_Realization != null;
+		case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
+			return realizedBy_path != null && !realizedBy_path.isEmpty();
+		case ElementsPackage.REALIZATION__REALIZED_PATH:
+			return realized_path != null && !realized_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ElementsPackage.REALIZATION__BASE_REALIZATION:
-				setBase_Realization((org.eclipse.uml2.uml.Realization)newValue);
-				return;
-			case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
-				getRealizedBy_path().clear();
-				getRealizedBy_path().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case ElementsPackage.REALIZATION__REALIZED_PATH:
-				getRealized_path().clear();
-				getRealized_path().addAll((Collection<? extends NamedElement>)newValue);
-				return;
+		switch(featureID) {
+		case ElementsPackage.REALIZATION__BASE_REALIZATION:
+			setBase_Realization((org.eclipse.uml2.uml.Realization)newValue);
+			return;
+		case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
+			getRealizedBy_path().clear();
+			getRealizedBy_path().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case ElementsPackage.REALIZATION__REALIZED_PATH:
+			getRealized_path().clear();
+			getRealized_path().addAll((Collection<? extends NamedElement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,20 +176,21 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.REALIZATION__BASE_REALIZATION:
-				setBase_Realization((org.eclipse.uml2.uml.Realization)null);
-				return;
-			case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
-				getRealizedBy_path().clear();
-				return;
-			case ElementsPackage.REALIZATION__REALIZED_PATH:
-				getRealized_path().clear();
-				return;
+		switch(featureID) {
+		case ElementsPackage.REALIZATION__BASE_REALIZATION:
+			setBase_Realization((org.eclipse.uml2.uml.Realization)null);
+			return;
+		case ElementsPackage.REALIZATION__REALIZED_BY_PATH:
+			getRealizedBy_path().clear();
+			return;
+		case ElementsPackage.REALIZATION__REALIZED_PATH:
+			getRealized_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -237,14 +247,15 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Realization getBase_Realization() {
-		if (base_Realization != null && base_Realization.eIsProxy()) {
+		if(base_Realization != null && base_Realization.eIsProxy()) {
 			InternalEObject oldBase_Realization = (InternalEObject)base_Realization;
 			base_Realization = (org.eclipse.uml2.uml.Realization)eResolveProxy(oldBase_Realization);
-			if (base_Realization != oldBase_Realization) {
-				if (eNotificationRequired())
+			if(base_Realization != oldBase_Realization) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementsPackage.REALIZATION__BASE_REALIZATION, oldBase_Realization, base_Realization));
 			}
 		}
@@ -254,6 +265,7 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Realization basicGetBase_Realization() {
@@ -263,22 +275,24 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Realization(org.eclipse.uml2.uml.Realization newBase_Realization) {
 		org.eclipse.uml2.uml.Realization oldBase_Realization = base_Realization;
 		base_Realization = newBase_Realization;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.REALIZATION__BASE_REALIZATION, oldBase_Realization, base_Realization));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getRealizedBy_path() {
-		if (realizedBy_path == null) {
+		if(realizedBy_path == null) {
 			realizedBy_path = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, ElementsPackage.REALIZATION__REALIZED_BY_PATH);
 		}
 		return realizedBy_path;
@@ -287,10 +301,11 @@ public class RealizationImpl extends RelationshipImpl implements Realization {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getRealized_path() {
-		if (realized_path == null) {
+		if(realized_path == null) {
 			realized_path = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, ElementsPackage.REALIZATION__REALIZED_PATH);
 		}
 		return realized_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RelationshipImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RelationshipImpl.java
index ef1523d793e..a386b9b423c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RelationshipImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/RelationshipImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class RelationshipImpl extends EAElementImpl implements Relationship {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RelationshipImpl() {
@@ -42,6 +44,7 @@ public abstract class RelationshipImpl extends EAElementImpl implements Relation
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/TraceableSpecificationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/TraceableSpecificationImpl.java
index b6968595035..abd8782c9db 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/TraceableSpecificationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/impl/TraceableSpecificationImpl.java
@@ -29,17 +29,19 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl#getNote <em>Note</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.elements.impl.TraceableSpecificationImpl#getNote <em>Note</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class TraceableSpecificationImpl extends EAPackageableElementImpl implements TraceableSpecification {
+
 	/**
 	 * The default value of the '{@link #getNote() <em>Note</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNote()
 	 * @generated
 	 * @ordered
@@ -50,6 +52,7 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	 * The cached value of the '{@link #getNote() <em>Note</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNote()
 	 * @generated
 	 * @ordered
@@ -59,6 +62,7 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TraceableSpecificationImpl() {
@@ -68,13 +72,14 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
-				return getNote();
+		switch(featureID) {
+		case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
+			return getNote();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -82,13 +87,14 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
-				return NOTE_EDEFAULT == null ? note != null : !NOTE_EDEFAULT.equals(note);
+		switch(featureID) {
+		case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
+			return NOTE_EDEFAULT == null ? note != null : !NOTE_EDEFAULT.equals(note);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -96,14 +102,15 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
-				setNote((String)newValue);
-				return;
+		switch(featureID) {
+		case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
+			setNote((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -111,6 +118,7 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,14 +129,15 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
-				setNote(NOTE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
+			setNote(NOTE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -136,6 +145,7 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getNote() {
@@ -145,23 +155,26 @@ public abstract class TraceableSpecificationImpl extends EAPackageableElementImp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNote(String newNote) {
 		String oldNote = note;
 		note = newNote;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ElementsPackage.TRACEABLE_SPECIFICATION__NOTE, oldNote, note));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (note: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsAdapterFactory.java
index ba90242410e..692b2c0e176 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.eastadl.infrastructure.elements.*;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Comment;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
@@ -37,14 +38,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage
  * @generated
  */
 public class ElementsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ElementsPackage modelPackage;
@@ -53,68 +57,81 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected ElementsSwitch<Adapter> modelSwitch =
-		new ElementsSwitch<Adapter>() {
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseRealization(Realization object) {
-				return createRealizationAdapter();
-			}
-			@Override
-			public Adapter caseRelationship(Relationship object) {
-				return createRelationshipAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter caseMultiLevelReference(MultiLevelReference object) {
-				return createMultiLevelReferenceAdapter();
-			}
-			@Override
-			public Adapter caseRationale(Rationale object) {
-				return createRationaleAdapter();
-			}
-			@Override
-			public Adapter caseEAPackage(EAPackage object) {
-				return createEAPackageAdapter();
-			}
-			@Override
-			public Adapter caseComment(Comment object) {
-				return createCommentAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseModelelements_Rationale(org.eclipse.papyrus.sysml.modelelements.Rationale object) {
-				return createModelelements_RationaleAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected ElementsSwitch<Adapter> modelSwitch = new ElementsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseRealization(Realization object) {
+			return createRealizationAdapter();
+		}
+
+		@Override
+		public Adapter caseRelationship(Relationship object) {
+			return createRelationshipAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter caseMultiLevelReference(MultiLevelReference object) {
+			return createMultiLevelReferenceAdapter();
+		}
+
+		@Override
+		public Adapter caseRationale(Rationale object) {
+			return createRationaleAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackage(EAPackage object) {
+			return createEAPackageAdapter();
+		}
+
+		@Override
+		public Adapter caseComment(Comment object) {
+			return createCommentAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseModelelements_Rationale(org.eclipse.papyrus.sysml.modelelements.Rationale object) {
+			return createModelelements_RationaleAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = ElementsPackage.eINSTANCE;
 		}
 	}
@@ -123,7 +140,9 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -138,6 +157,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -152,6 +172,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -160,11 +181,13 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference <em>Multi Level Reference</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference
+	 * <em>Multi Level Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.MultiLevelReference
 	 * @generated
@@ -179,6 +202,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Rationale
 	 * @generated
@@ -193,6 +217,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackage
 	 * @generated
@@ -207,6 +232,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Comment
 	 * @generated
@@ -221,6 +247,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -235,6 +262,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Realization
 	 * @generated
@@ -249,6 +277,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship
 	 * @generated
@@ -258,11 +287,13 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -272,11 +303,13 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -291,6 +324,7 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale
 	 * @generated
@@ -304,15 +338,16 @@ public class ElementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceFactoryImpl.java
index 754643b1aa0..2c8c34f88b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.util.ElementsResourceImpl
  * @generated
  */
 public class ElementsResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class ElementsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceImpl.java
index b96b8a9f20c..d4fb3dd02b8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.util.ElementsResourceFactoryImpl
  * @generated
  */
 public class ElementsResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public ElementsResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsSwitch.java
index 5caf7f31fca..93c996911af 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsSwitch.java
@@ -18,6 +18,7 @@ package org.eclipse.papyrus.eastadl.infrastructure.elements.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.eastadl.infrastructure.elements.*;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Comment;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
@@ -34,21 +35,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage
  * @generated
  */
 public class ElementsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static ElementsPackage modelPackage;
@@ -57,10 +60,11 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = ElementsPackage.eINSTANCE;
 		}
 	}
@@ -69,6 +73,7 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -84,7 +89,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -99,7 +106,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Multi Level Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -114,7 +123,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rationale</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -129,7 +140,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Package</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -144,7 +157,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Comment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -159,7 +174,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -174,7 +191,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Realization</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -189,7 +208,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -204,7 +225,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -219,7 +242,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -234,7 +259,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rationale</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -249,7 +276,9 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -263,84 +292,117 @@ public class ElementsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ElementsPackage.TRACEABLE_SPECIFICATION: {
-				TraceableSpecification traceableSpecification = (TraceableSpecification)theEObject;
-				T result = caseTraceableSpecification(traceableSpecification);
-				if (result == null) result = caseEAPackageableElement(traceableSpecification);
-				if (result == null) result = caseEAElement(traceableSpecification);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.EA_PACKAGEABLE_ELEMENT: {
-				EAPackageableElement eaPackageableElement = (EAPackageableElement)theEObject;
-				T result = caseEAPackageableElement(eaPackageableElement);
-				if (result == null) result = caseEAElement(eaPackageableElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.REALIZATION: {
-				Realization realization = (Realization)theEObject;
-				T result = caseRealization(realization);
-				if (result == null) result = caseRelationship(realization);
-				if (result == null) result = caseEAElement(realization);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.RELATIONSHIP: {
-				Relationship relationship = (Relationship)theEObject;
-				T result = caseRelationship(relationship);
-				if (result == null) result = caseEAElement(relationship);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.CONTEXT: {
-				Context context = (Context)theEObject;
-				T result = caseContext(context);
-				if (result == null) result = caseEAElement(context);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.MULTI_LEVEL_REFERENCE: {
-				MultiLevelReference multiLevelReference = (MultiLevelReference)theEObject;
-				T result = caseMultiLevelReference(multiLevelReference);
-				if (result == null) result = caseRelationship(multiLevelReference);
-				if (result == null) result = caseEAElement(multiLevelReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.RATIONALE: {
-				Rationale rationale = (Rationale)theEObject;
-				T result = caseRationale(rationale);
-				if (result == null) result = caseModelelements_Rationale(rationale);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.EA_PACKAGE: {
-				EAPackage eaPackage = (EAPackage)theEObject;
-				T result = caseEAPackage(eaPackage);
-				if (result == null) result = caseEAElement(eaPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.COMMENT: {
-				Comment comment = (Comment)theEObject;
-				T result = caseComment(comment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementsPackage.EA_ELEMENT: {
-				EAElement eaElement = (EAElement)theEObject;
-				T result = caseEAElement(eaElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case ElementsPackage.TRACEABLE_SPECIFICATION:
+		{
+			TraceableSpecification traceableSpecification = (TraceableSpecification)theEObject;
+			T result = caseTraceableSpecification(traceableSpecification);
+			if(result == null)
+				result = caseEAPackageableElement(traceableSpecification);
+			if(result == null)
+				result = caseEAElement(traceableSpecification);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.EA_PACKAGEABLE_ELEMENT:
+		{
+			EAPackageableElement eaPackageableElement = (EAPackageableElement)theEObject;
+			T result = caseEAPackageableElement(eaPackageableElement);
+			if(result == null)
+				result = caseEAElement(eaPackageableElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.REALIZATION:
+		{
+			Realization realization = (Realization)theEObject;
+			T result = caseRealization(realization);
+			if(result == null)
+				result = caseRelationship(realization);
+			if(result == null)
+				result = caseEAElement(realization);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.RELATIONSHIP:
+		{
+			Relationship relationship = (Relationship)theEObject;
+			T result = caseRelationship(relationship);
+			if(result == null)
+				result = caseEAElement(relationship);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.CONTEXT:
+		{
+			Context context = (Context)theEObject;
+			T result = caseContext(context);
+			if(result == null)
+				result = caseEAElement(context);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.MULTI_LEVEL_REFERENCE:
+		{
+			MultiLevelReference multiLevelReference = (MultiLevelReference)theEObject;
+			T result = caseMultiLevelReference(multiLevelReference);
+			if(result == null)
+				result = caseRelationship(multiLevelReference);
+			if(result == null)
+				result = caseEAElement(multiLevelReference);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.RATIONALE:
+		{
+			Rationale rationale = (Rationale)theEObject;
+			T result = caseRationale(rationale);
+			if(result == null)
+				result = caseModelelements_Rationale(rationale);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.EA_PACKAGE:
+		{
+			EAPackage eaPackage = (EAPackage)theEObject;
+			T result = caseEAPackage(eaPackage);
+			if(result == null)
+				result = caseEAElement(eaPackage);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.COMMENT:
+		{
+			Comment comment = (Comment)theEObject;
+			T result = caseComment(comment);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ElementsPackage.EA_ELEMENT:
+		{
+			EAElement eaElement = (EAElement)theEObject;
+			T result = caseEAElement(eaElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsXMLProcessor.java
index 3b8f7c0950f..2b94139c0ed 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/elements/util/ElementsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ElementsXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class ElementsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementsXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		ElementsPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the ElementsResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new ElementsResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new ElementsResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructureFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructureFactoryImpl.java
index 23ecf22564f..862f5784233 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructureFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructureFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.infrastructure.*;
 import org.eclipse.papyrus.eastadl.infrastructure.InfrastructureFactory;
 import org.eclipse.papyrus.eastadl.infrastructure.InfrastructurePackage;
 
@@ -29,12 +30,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.InfrastructurePackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InfrastructureFactoryImpl extends EFactoryImpl implements InfrastructureFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -47,16 +51,16 @@ public class InfrastructureFactoryImpl extends EFactoryImpl implements Infrastru
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static InfrastructureFactory init() {
 		try {
 			InfrastructureFactory theInfrastructureFactory = (InfrastructureFactory)EPackage.Registry.INSTANCE.getEFactory(InfrastructurePackage.eNS_URI);
-			if (theInfrastructureFactory != null) {
+			if(theInfrastructureFactory != null) {
 				return theInfrastructureFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new InfrastructureFactoryImpl();
@@ -66,6 +70,7 @@ public class InfrastructureFactoryImpl extends EFactoryImpl implements Infrastru
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InfrastructureFactoryImpl() {
@@ -75,6 +80,7 @@ public class InfrastructureFactoryImpl extends EFactoryImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {
@@ -84,34 +90,37 @@ public class InfrastructureFactoryImpl extends EFactoryImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case InfrastructurePackage.DUMMY:
-				return convertDummyToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case InfrastructurePackage.DUMMY:
+			return convertDummyToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createDummyFromString(EDataType eDataType, String initialValue) {
@@ -121,21 +130,23 @@ public class InfrastructureFactoryImpl extends EFactoryImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case InfrastructurePackage.DUMMY:
-				return createDummyFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case InfrastructurePackage.DUMMY:
+			return createDummyFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InfrastructurePackage getInfrastructurePackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructurePackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructurePackageImpl.java
index 4ccc9487c50..a0ad14cd5d7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructurePackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/impl/InfrastructurePackageImpl.java
@@ -81,6 +81,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InfrastructurePackageImpl extends EPackageImpl implements InfrastructurePackage {
@@ -88,6 +89,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType dummyEDataType = null;
@@ -95,6 +97,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -102,16 +105,18 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * 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 InfrastructurePackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link InfrastructurePackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static InfrastructurePackage init() {
-		if (isInited) return (InfrastructurePackage)EPackage.Registry.INSTANCE.getEPackage(InfrastructurePackage.eNS_URI);
+		if(isInited)
+			return (InfrastructurePackage)EPackage.Registry.INSTANCE.getEPackage(InfrastructurePackage.eNS_URI);
 
 		// Obtain or create and register package
 		InfrastructurePackageImpl theInfrastructurePackage = (InfrastructurePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InfrastructurePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InfrastructurePackageImpl());
@@ -213,7 +218,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 		// Mark meta-data to indicate it can't be changed
 		theInfrastructurePackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(InfrastructurePackage.eNS_URI, theInfrastructurePackage);
 		return theInfrastructurePackage;
@@ -222,6 +227,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -229,19 +235,19 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.InfrastructurePackage#eNS_URI
 	 * @see #init()
@@ -252,14 +258,16 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create data types
@@ -269,6 +277,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getDummy() {
@@ -278,6 +287,7 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InfrastructureFactory getInfrastructureFactory() {
@@ -285,14 +295,16 @@ public class InfrastructurePackageImpl extends EPackageImpl implements Infrastru
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeDefinition.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeDefinition.java
index 5ee051d9089..c8010f50316 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeDefinition.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeDefinition.java
@@ -25,37 +25,40 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>User Attribute Definition</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * UserAttributeDefinition represents a user attribute, i.e. it states that all UserAttributeableElements of a certain UserAttributeElementType are to be attached with an attribute identified by 'key'. For example, it can be specified that certain elements should be amended with an attribute "Status".
+ * UserAttributeDefinition represents a user attribute, i.e. it states that all UserAttributeableElements of a certain UserAttributeElementType are to
+ * be attached with an attribute identified by 'key'. For example, it can be specified that certain elements should be amended with an attribute
+ * "Status".
  * 
  * Extension:
  * Class, Property
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeDefinition()
  * @model
  * @generated
  */
 public interface UserAttributeDefinition extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeDefinition_Base_Class()
@@ -65,10 +68,13 @@ public interface UserAttributeDefinition extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -78,10 +84,10 @@ public interface UserAttributeDefinition extends EAElement {
 	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Value</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Value</em>' attribute.
 	 * @see #setDefaultValue(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeDefinition_DefaultValue()
@@ -91,10 +97,13 @@ public interface UserAttributeDefinition extends EAElement {
 	String getDefaultValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue <em>Default Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue
+	 * <em>Default Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Default Value</em>' attribute.
 	 * @see #getDefaultValue()
 	 * @generated
 	 */
@@ -104,10 +113,10 @@ public interface UserAttributeDefinition extends EAElement {
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(EADatatype)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeDefinition_Type()
@@ -117,10 +126,13 @@ public interface UserAttributeDefinition extends EAElement {
 	EADatatype getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType <em>Type</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Type</em>' reference.
 	 * @see #getType()
 	 * @generated
 	 */
@@ -130,10 +142,10 @@ public interface UserAttributeDefinition extends EAElement {
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeDefinition_Base_Property()
@@ -143,10 +155,13 @@ public interface UserAttributeDefinition extends EAElement {
 	Property getBase_Property();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property
+	 * <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeElementType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeElementType.java
index da2780a70d3..d222bf7c0a4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeElementType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeElementType.java
@@ -23,33 +23,38 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>User Attribute Element Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * UserAttributeElementType represents a certain, user-defined type of user attributeable elements. With such a type, one or more user attributes can be defined for all user attributeable elements of that type.
+ * UserAttributeElementType represents a certain, user-defined type of user attributeable elements. With such a type, one or more user attributes can
+ * be defined for all user attributeable elements of that type.
  * 
- * For example, engineers at Volkswagen could create a UserAttributeElementType called "VWFunction" with a single user attribute definition. That way, all FunctionTypes for which "VWFunction" is defined as the UserAttributeElementType via association uaType will have the corresponding user attribute.
+ * For example, engineers at Volkswagen could create a UserAttributeElementType called "VWFunction" with a single user attribute definition. That way,
+ * all FunctionTypes for which "VWFunction" is defined as the UserAttributeElementType via association uaType will have the corresponding user
+ * attribute.
  * 
  * User attribute element types can be compared to stereotypes in UML2, but are less rigidly defined.
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType <em>Extended Element Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor <em>Valid For</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType <em>Extended Element Type
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getAttribute <em>Attribute</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor <em>Valid For</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeElementType()
  * @model
  * @generated
  */
 public interface UserAttributeElementType extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Attribute</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition}.
@@ -60,6 +65,7 @@ public interface UserAttributeElementType extends EAElement {
 	 * 
 	 * Note that also inherited attribute definitions need to be taken into account.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Attribute</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeElementType_Attribute()
 	 * @model ordered="false"
@@ -71,10 +77,10 @@ public interface UserAttributeElementType extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeElementType_Base_Class()
@@ -84,10 +90,13 @@ public interface UserAttributeElementType extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -100,8 +109,11 @@ public interface UserAttributeElementType extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The UAElementTypes this type is inheriting from.
 	 * 
-	 * When UAElementType ET2 inherits from type ET1, then this means that all attributes defined for ET1 by way of UserAttributeDefinitions are available whenever ET2 is specified as the type of a user attributeable element (in addition to those directly defined in ET2).  This includes UserAttributeDefinitions which ET1 itself may inherit from other types.
+	 * When UAElementType ET2 inherits from type ET1, then this means that all attributes defined for ET1 by way of UserAttributeDefinitions are
+	 * available whenever ET2 is specified as the type of a user attributeable element (in addition to those directly defined in ET2). This includes
+	 * UserAttributeDefinitions which ET1 itself may inherit from other types.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Extended Element Type</em>' reference.
 	 * @see #setExtendedElementType(UserAttributeElementType)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeElementType_ExtendedElementType()
@@ -114,10 +126,10 @@ public interface UserAttributeElementType extends EAElement {
 	 * Returns the value of the '<em><b>Valid For</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Valid For</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Valid For</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Valid For</em>' attribute.
 	 * @see #setValidFor(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeElementType_ValidFor()
@@ -127,20 +139,26 @@ public interface UserAttributeElementType extends EAElement {
 	String getValidFor();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType <em>Extended Element Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType
+	 * <em>Extended Element Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extended Element Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Extended Element Type</em>' reference.
 	 * @see #getExtendedElementType()
 	 * @generated
 	 */
 	void setExtendedElementType(UserAttributeElementType value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor <em>Valid For</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor
+	 * <em>Valid For</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Valid For</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Valid For</em>' attribute.
 	 * @see #getValidFor()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeValue.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeValue.java
index c3579260c24..9e65c35795b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeValue.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeValue.java
@@ -24,41 +24,46 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>User Attribute Value</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * UserAttributeValue represents a specific value for a certain user attribute. User attributes are simple key/value pairs which can be attached to all UserAttributeableElements. Each user attribute is identified by a globally unique key.
+ * UserAttributeValue represents a specific value for a certain user attribute. User attributes are simple key/value pairs which can be attached to
+ * all UserAttributeableElements. Each user attribute is identified by a globally unique key.
  * 
- * In principle, there is no restriction which user attributes, i.e. keys, may be attached to a particular element and what strings may be used as value (cf. class UserAttributeableElement). However, user attribute definitions can be used to define a set of legal values for a particular key (see class UserAttributeDefinition) and user attribute element types can be used to state what attributes, i.e. keys, may or should be attached to elements of certain types (cf. class UserAttributeElementType).
+ * In principle, there is no restriction which user attributes, i.e. keys, may be attached to a particular element and what strings may be used as
+ * value (cf. class UserAttributeableElement). However, user attribute definitions can be used to define a set of legal values for a particular key
+ * (see class UserAttributeDefinition) and user attribute element types can be used to state what attributes, i.e. keys, may or should be attached to
+ * elements of certain types (cf. class UserAttributeElementType).
  * 
  * The actual value is captured in attribute 'value' and is always represented as a string.
  * 
  * Extension:
  * Class, Property
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeValue()
  * @model
  * @generated
  */
 public interface UserAttributeValue extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeValue_Base_Class()
@@ -68,10 +73,13 @@ public interface UserAttributeValue extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -81,10 +89,10 @@ public interface UserAttributeValue extends EAElement {
 	 * Returns the value of the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeValue_Value()
@@ -97,10 +105,10 @@ public interface UserAttributeValue extends EAElement {
 	 * Returns the value of the '<em><b>Definition</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Definition</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #setDefinition(UserAttributeDefinition)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeValue_Definition()
@@ -110,10 +118,13 @@ public interface UserAttributeValue extends EAElement {
 	UserAttributeDefinition getDefinition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition <em>Definition</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition <em>Definition</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Definition</em>' reference.
 	 * @see #getDefinition()
 	 * @generated
 	 */
@@ -123,7 +134,9 @@ public interface UserAttributeValue extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
@@ -133,10 +146,10 @@ public interface UserAttributeValue extends EAElement {
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeValue_Base_Property()
@@ -146,10 +159,13 @@ public interface UserAttributeValue extends EAElement {
 	Property getBase_Property();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property
+	 * <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeableElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeableElement.java
index 0fbe783d378..a5d532bd94f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeableElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserAttributeableElement.java
@@ -23,32 +23,40 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>User Attributeable Element</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * UserAttributableElement represents an element to which user attributes can be attached. This is done by way of UserAttributeValues (see association 'uaValues'). What user attributes a certain element should be supplied with can be defined beforehand with UserAttributeDefinitions which are organized in UserAttributeElementTypes (see association 'uaTypes').
+ * UserAttributableElement represents an element to which user attributes can be attached. This is done by way of UserAttributeValues (see association
+ * 'uaValues'). What user attributes a certain element should be supplied with can be defined beforehand with UserAttributeDefinitions which are
+ * organized in UserAttributeElementTypes (see association 'uaTypes').
  * 
- * IMPORTANT: It is technically possible and legal to attach any key/value pair, even if this is in conflict with the attribute definitions of the UserAttributeElementTypes of this UserAttributeableElement (as defined by association 'uaTypes'). All implementations of this information model must expect such attribute definition violations. The reason for this is that (1) the attribute definitions and the types they define for the attributes are only meant as a guideline for working with user attributes on the modeling level, not as an implementation level type system and (2) this convention avoids a multitude of intricate problems when editing a model's user attribute definitions or values, which significantly simplifies implementation.
+ * IMPORTANT: It is technically possible and legal to attach any key/value pair, even if this is in conflict with the attribute definitions of the
+ * UserAttributeElementTypes of this UserAttributeableElement (as defined by association 'uaTypes'). All implementations of this information model
+ * must expect such attribute definition violations. The reason for this is that (1) the attribute definitions and the types they define for the
+ * attributes are only meant as a guideline for working with user attributes on the modeling level, not as an implementation level type system and (2)
+ * this convention avoids a multitude of intricate problems when editing a model's user attribute definitions or values, which significantly
+ * simplifies implementation.
  * 
  * 
  * Extension:
  * NamedElement
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaValue <em>Ua Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaType <em>Ua Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement <em>Attributed Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaValue <em>Ua Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaType <em>Ua Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement <em>Attributed Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement <em>Base Named Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeableElement()
  * @model
  * @generated
  */
 public interface UserAttributeableElement extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Ua Type</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType}.
@@ -57,8 +65,10 @@ public interface UserAttributeableElement extends EObject {
 	 * <!-- begin-model-doc -->
 	 * The UAElementTypes of this user attirbuteable element.
 	 * 
-	 * It is possible to provide more than one type.  In that case, the UserAttributeDefinitions of all UAElementTypes apply.  If there are several attribute definitions with an identical 'key', then the corresponding user attribute will be applied only once.
+	 * It is possible to provide more than one type. In that case, the UserAttributeDefinitions of all UAElementTypes apply. If there are several
+	 * attribute definitions with an identical 'key', then the corresponding user attribute will be applied only once.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Ua Type</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeableElement_UaType()
 	 * @model ordered="false"
@@ -70,10 +80,10 @@ public interface UserAttributeableElement extends EObject {
 	 * Returns the value of the '<em><b>Attributed Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Attributed Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Attributed Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Attributed Element</em>' reference.
 	 * @see #setAttributedElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeableElement_AttributedElement()
@@ -83,10 +93,13 @@ public interface UserAttributeableElement extends EObject {
 	NamedElement getAttributedElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement <em>Attributed Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement
+	 * <em>Attributed Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attributed Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Attributed Element</em>' reference.
 	 * @see #getAttributedElement()
 	 * @generated
 	 */
@@ -96,10 +109,10 @@ public interface UserAttributeableElement extends EObject {
 	 * Returns the value of the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Named Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Named Element</em>' reference.
 	 * @see #setBase_NamedElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeableElement_Base_NamedElement()
@@ -109,10 +122,13 @@ public interface UserAttributeableElement extends EObject {
 	NamedElement getBase_NamedElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement <em>Base Named Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement
+	 * <em>Base Named Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Named Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Named Element</em>' reference.
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 */
@@ -126,6 +142,7 @@ public interface UserAttributeableElement extends EObject {
 	 * <!-- begin-model-doc -->
 	 * The user attribute values, i.e. key-value pairs, which are attached to this element.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Ua Value</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#getUserAttributeableElement_UaValue()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesFactory.java
index a0963b0add7..82e06642766 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage
  * @generated
  */
 public interface UserattributesFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	UserattributesFactory eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface UserattributesFactory extends EFactory {
 	 * Returns a new object of class '<em>User Attribute Definition</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>User Attribute Definition</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface UserattributesFactory extends EFactory {
 	 * Returns a new object of class '<em>User Attributeable Element</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>User Attributeable Element</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface UserattributesFactory extends EFactory {
 	 * Returns a new object of class '<em>User Attribute Element Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>User Attribute Element Type</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface UserattributesFactory extends EFactory {
 	 * Returns a new object of class '<em>User Attribute Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>User Attribute Value</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface UserattributesFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesPackage.java
index 48658dc05c4..4a1525bdc53 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/UserattributesPackage.java
@@ -27,43 +27,68 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * User attributes in EAST-ADL2 are primarily intended to provide a mechanism for augmenting the elements of an EAST-ADL2 model with customized meta-information.  All instances of metaclass ADLEntity can have user attributes attached to them.  The scope and structuring of this meta-information can be defined on a per-project basis by defining user attributes for certain types of EAST-ADL2 elements within UATemplates.
- * Since EAST-ADL2 requirements are in their most general form simple objects with all information contained in user-customized, project-specific attributes, the concept of user attributes is also perfectly suitable to define those attributes of requirements.  In that sense, basic requirements in EAST-ADL2 can be seen as "empty" elements which only provide a node to which user attributes can be attached in order to supply the requirement with all necessary information, including its main textual description.  However, in case of requirements the context in which the available user attributes are defined is different: here the container of the requirements is the point where user attribute definitions are store and these are then applicable only within this container.
- * The role of user attributes within the overall EAST-ADL2 is thus twofold: they (1) provide a means to customize the language to specific company and project needs and (2) constitute an important part of the requirements support of the language.
- * The mechanism of user attributes was optimized for flexibility and simplicity.  In particular, the actual attributes attached to an element and/or their values may well conflict the attribute definitions in effect for this element.  For example, it is perfectly legal to not provide an attribute value if an attribute definition was specified or, the other way round, to provide a value for an undefined attribute.  The attribute definitions are merely meant as a guideline for the engineer and as a basis for optionally checking if all attribute values are correct with respect to attribute definitions (by way of appropriate tool support).  With this conception of attribute values and definitions, many intricacies and difficult situations during the creation and evolution of a model are circumvented and complex interdependencies between parts of the model are avoided.  For example, it is made sure that a model and all its user attribute values can be safely viewed and edited even if the attribute definitions (i.e. UATemplates) for the model are temporarily unavailable or permanently lost.
+ * User attributes in EAST-ADL2 are primarily intended to provide a mechanism for augmenting the elements of an EAST-ADL2 model with customized
+ * meta-information. All instances of metaclass ADLEntity can have user attributes attached to them. The scope and structuring of this
+ * meta-information can be defined on a per-project basis by defining user attributes for certain types of EAST-ADL2 elements within UATemplates.
+ * Since EAST-ADL2 requirements are in their most general form simple objects with all information contained in user-customized, project-specific
+ * attributes, the concept of user attributes is also perfectly suitable to define those attributes of requirements. In that sense, basic requirements
+ * in EAST-ADL2 can be seen as "empty" elements which only provide a node to which user attributes can be attached in order to supply the requirement
+ * with all necessary information, including its main textual description. However, in case of requirements the context in which the available user
+ * attributes are defined is different: here the container of the requirements is the point where user attribute definitions are store and these are
+ * then applicable only within this container.
+ * The role of user attributes within the overall EAST-ADL2 is thus twofold: they (1) provide a means to customize the language to specific company
+ * and project needs and (2) constitute an important part of the requirements support of the language.
+ * The mechanism of user attributes was optimized for flexibility and simplicity. In particular, the actual attributes attached to an element and/or
+ * their values may well conflict the attribute definitions in effect for this element. For example, it is perfectly legal to not provide an attribute
+ * value if an attribute definition was specified or, the other way round, to provide a value for an undefined attribute. The attribute definitions
+ * are merely meant as a guideline for the engineer and as a basis for optionally checking if all attribute values are correct with respect to
+ * attribute definitions (by way of appropriate tool support). With this conception of attribute values and definitions, many intricacies and
+ * difficult situations during the creation and evolution of a model are circumvented and complex interdependencies between parts of the model are
+ * avoided. For example, it is made sure that a model and all its user attribute values can be safely viewed and edited even if the attribute
+ * definitions (i.e. UATemplates) for the model are temporarily unavailable or permanently lost.
  * 
  * Overview:
- * The stereotypes defined in this subprofile provide a set of constructs to help user define their own attributes. The core construct in EAST-ADL2, the ADLEntity, inherits from UserAttributableElement stereotype so that virtually any types of EAST-ADL2 entities might be enhanced with user-defined attributes. Of course in a UML model one is allowed to add attributes to the classes and UML elements on which stereotypes are applied, yet this mechanism enables to distinguish between attributes meant to be interpreted as compliant with EASt-ADL2 language and other if any.
+ * The stereotypes defined in this subprofile provide a set of constructs to help user define their own attributes. The core construct in EAST-ADL2,
+ * the ADLEntity, inherits from UserAttributableElement stereotype so that virtually any types of EAST-ADL2 entities might be enhanced with
+ * user-defined attributes. Of course in a UML model one is allowed to add attributes to the classes and UML elements on which stereotypes are
+ * applied, yet this mechanism enables to distinguish between attributes meant to be interpreted as compliant with EASt-ADL2 language and other if
+ * any.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesFactory
  * @model kind="package"
  * @generated
  */
 public interface UserattributesPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl <em>User Attribute Element Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl
+		 * <em>User Attribute Element Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeElementType()
 		 * @generated
@@ -74,6 +99,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Extended Element Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE = eINSTANCE.getUserAttributeElementType_ExtendedElementType();
@@ -82,6 +108,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Attribute</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE = eINSTANCE.getUserAttributeElementType_Attribute();
@@ -90,6 +117,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS = eINSTANCE.getUserAttributeElementType_Base_Class();
@@ -98,14 +126,17 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Valid For</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR = eINSTANCE.getUserAttributeElementType_ValidFor();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl <em>User Attribute Definition</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl
+		 * <em>User Attribute Definition</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeDefinition()
 		 * @generated
@@ -116,6 +147,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY = eINSTANCE.getUserAttributeDefinition_Base_Property();
@@ -124,6 +156,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_DEFINITION__BASE_CLASS = eINSTANCE.getUserAttributeDefinition_Base_Class();
@@ -132,6 +165,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE = eINSTANCE.getUserAttributeDefinition_DefaultValue();
@@ -140,14 +174,17 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_DEFINITION__TYPE = eINSTANCE.getUserAttributeDefinition_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl <em>User Attributeable Element</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl
+		 * <em>User Attributeable Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeableElement()
 		 * @generated
@@ -158,6 +195,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Ua Value</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE = eINSTANCE.getUserAttributeableElement_UaValue();
@@ -166,6 +204,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Ua Type</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE = eINSTANCE.getUserAttributeableElement_UaType();
@@ -174,6 +213,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Attributed Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT = eINSTANCE.getUserAttributeableElement_AttributedElement();
@@ -182,14 +222,17 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT = eINSTANCE.getUserAttributeableElement_Base_NamedElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl <em>User Attribute Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl
+		 * <em>User Attribute Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl
 		 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeValue()
 		 * @generated
@@ -200,6 +243,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_VALUE__BASE_CLASS = eINSTANCE.getUserAttributeValue_Base_Class();
@@ -208,6 +252,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute USER_ATTRIBUTE_VALUE__VALUE = eINSTANCE.getUserAttributeValue_Value();
@@ -216,6 +261,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_VALUE__BASE_PROPERTY = eINSTANCE.getUserAttributeValue_Base_Property();
@@ -224,6 +270,7 @@ public interface UserattributesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USER_ATTRIBUTE_VALUE__DEFINITION = eINSTANCE.getUserAttributeValue_Definition();
@@ -234,6 +281,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "userattributes";
@@ -242,6 +290,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Infrastructure/UserAttributes/1";
@@ -250,6 +299,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "UserAttributes";
@@ -258,14 +308,17 @@ public interface UserattributesPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	UserattributesPackage eINSTANCE = org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl <em>User Attributeable Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl
+	 * <em>User Attributeable Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeableElement()
 	 * @generated
@@ -273,9 +326,11 @@ public interface UserattributesPackage extends EPackage {
 	int USER_ATTRIBUTEABLE_ELEMENT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl <em>User Attribute Element Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl
+	 * <em>User Attribute Element Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeElementType()
 	 * @generated
@@ -283,9 +338,11 @@ public interface UserattributesPackage extends EPackage {
 	int USER_ATTRIBUTE_ELEMENT_TYPE = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl <em>User Attribute Definition</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl
+	 * <em>User Attribute Definition</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeDefinition()
 	 * @generated
@@ -293,9 +350,11 @@ public interface UserattributesPackage extends EPackage {
 	int USER_ATTRIBUTE_DEFINITION = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl <em>User Attribute Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl
+	 * <em>User Attribute Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserattributesPackageImpl#getUserAttributeValue()
 	 * @generated
@@ -306,6 +365,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -315,6 +375,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -324,6 +385,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -333,6 +395,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Extended Element Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -342,6 +405,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -351,6 +415,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -360,6 +425,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Valid For</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -369,6 +435,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The number of structural features of the '<em>User Attribute Element Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -378,6 +445,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -387,6 +455,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -396,6 +465,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -405,6 +475,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -414,6 +485,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -423,6 +495,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -432,6 +505,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -441,6 +515,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The number of structural features of the '<em>User Attribute Definition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -450,6 +525,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Ua Value</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -459,6 +535,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Ua Type</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -468,6 +545,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Attributed Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -477,6 +555,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -486,6 +565,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The number of structural features of the '<em>User Attributeable Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -495,6 +575,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -504,6 +585,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -513,6 +595,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -522,6 +605,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -531,6 +615,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +625,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +635,7 @@ public interface UserattributesPackage extends EPackage {
 	 * The feature id for the '<em><b>Definition</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,15 +645,18 @@ public interface UserattributesPackage extends EPackage {
 	 * The number of structural features of the '<em>User Attribute Value</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int USER_ATTRIBUTE_VALUE_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement <em>User Attributeable Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement
+	 * <em>User Attributeable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>User Attributeable Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement
 	 * @generated
@@ -574,9 +664,11 @@ public interface UserattributesPackage extends EPackage {
 	EClass getUserAttributeableElement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaType <em>Ua Type</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaType <em>Ua Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Ua Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaType()
 	 * @see #getUserAttributeableElement()
@@ -585,9 +677,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeableElement_UaType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement <em>Attributed Element</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement <em>Attributed Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Attributed Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getAttributedElement()
 	 * @see #getUserAttributeableElement()
@@ -596,9 +690,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeableElement_AttributedElement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement <em>Base Named Element</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement <em>Base Named Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Named Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getBase_NamedElement()
 	 * @see #getUserAttributeableElement()
@@ -607,9 +703,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeableElement_Base_NamedElement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaValue <em>Ua Value</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaValue <em>Ua Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Ua Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement#getUaValue()
 	 * @see #getUserAttributeableElement()
@@ -618,9 +716,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeableElement_UaValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition <em>User Attribute Definition</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition
+	 * <em>User Attribute Definition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>User Attribute Definition</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition
 	 * @generated
@@ -628,9 +728,11 @@ public interface UserattributesPackage extends EPackage {
 	EClass getUserAttributeDefinition();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Class()
 	 * @see #getUserAttributeDefinition()
@@ -639,9 +741,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeDefinition_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue <em>Default Value</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue <em>Default Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Default Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getDefaultValue()
 	 * @see #getUserAttributeDefinition()
@@ -650,9 +754,11 @@ public interface UserattributesPackage extends EPackage {
 	EAttribute getUserAttributeDefinition_DefaultValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType
+	 * <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getType()
 	 * @see #getUserAttributeDefinition()
@@ -661,9 +767,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeDefinition_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition#getBase_Property()
 	 * @see #getUserAttributeDefinition()
@@ -672,9 +780,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeDefinition_Base_Property();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType <em>User Attribute Element Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType
+	 * <em>User Attribute Element Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>User Attribute Element Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType
 	 * @generated
@@ -682,9 +792,11 @@ public interface UserattributesPackage extends EPackage {
 	EClass getUserAttributeElementType();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getAttribute <em>Attribute</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getAttribute <em>Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Attribute</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getAttribute()
 	 * @see #getUserAttributeElementType()
@@ -693,9 +805,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeElementType_Attribute();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getBase_Class()
 	 * @see #getUserAttributeElementType()
@@ -704,9 +818,12 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeElementType_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType <em>Extended Element Type</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType
+	 * <em>Extended Element Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Extended Element Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getExtendedElementType()
 	 * @see #getUserAttributeElementType()
@@ -715,9 +832,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeElementType_ExtendedElementType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor <em>Valid For</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor <em>Valid For</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Valid For</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType#getValidFor()
 	 * @see #getUserAttributeElementType()
@@ -729,15 +848,18 @@ public interface UserattributesPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	UserattributesFactory getUserattributesFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue <em>User Attribute Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue
+	 * <em>User Attribute Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>User Attribute Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue
 	 * @generated
@@ -745,9 +867,11 @@ public interface UserattributesPackage extends EPackage {
 	EClass getUserAttributeValue();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Class()
 	 * @see #getUserAttributeValue()
@@ -756,9 +880,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeValue_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition <em>Definition</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition
+	 * <em>Definition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Definition</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getDefinition()
 	 * @see #getUserAttributeValue()
@@ -767,9 +893,11 @@ public interface UserattributesPackage extends EPackage {
 	EReference getUserAttributeValue_Definition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue
+	 * <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getValue()
 	 * @see #getUserAttributeValue()
@@ -778,9 +906,11 @@ public interface UserattributesPackage extends EPackage {
 	EAttribute getUserAttributeValue_Value();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue#getBase_Property()
 	 * @see #getUserAttributeValue()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeDefinitionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeDefinitionImpl.java
index 42f6fb8f582..67aea77ef9c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeDefinitionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeDefinitionImpl.java
@@ -33,20 +33,22 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getDefaultValue <em>Default Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeDefinitionImpl#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAttributeDefinition {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -57,6 +59,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	 * The default value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	 * The cached value of the '{@link #getDefaultValue() <em>Default Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultValue()
 	 * @generated
 	 * @ordered
@@ -77,6 +81,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -87,6 +92,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
@@ -96,6 +102,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UserAttributeDefinitionImpl() {
@@ -105,22 +112,26 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
-				return getDefaultValue();
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
+			return getDefaultValue();
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -128,19 +139,20 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
-				return base_Class != null;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null : !DEFAULT_VALUE_EDEFAULT.equals(defaultValue);
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
-				return type != null;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
-				return base_Property != null;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
+			return base_Class != null;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
+			return DEFAULT_VALUE_EDEFAULT == null ? defaultValue != null : !DEFAULT_VALUE_EDEFAULT.equals(defaultValue);
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
+			return type != null;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
+			return base_Property != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -148,23 +160,24 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
-				setDefaultValue((String)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
-				setType((EADatatype)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
+			setDefaultValue((String)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
+			setType((EADatatype)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -172,6 +185,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,14 +196,15 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -199,6 +214,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -208,35 +224,37 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
-				setDefaultValue(DEFAULT_VALUE_EDEFAULT);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
-				setType((EADatatype)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE:
+			setDefaultValue(DEFAULT_VALUE_EDEFAULT);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE:
+			setType((EADatatype)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -244,6 +262,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDefaultValue() {
@@ -253,26 +272,28 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultValue(String newDefaultValue) {
 		String oldDefaultValue = defaultValue;
 		defaultValue = newDefaultValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__DEFAULT_VALUE, oldDefaultValue, defaultValue));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype getType() {
-		if (type != null && type.eIsProxy()) {
+		if(type != null && type.eIsProxy()) {
 			InternalEObject oldType = (InternalEObject)type;
 			type = (EADatatype)eResolveProxy(oldType);
-			if (type != oldType) {
-				if (eNotificationRequired())
+			if(type != oldType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE, oldType, type));
 			}
 		}
@@ -282,6 +303,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype basicGetType() {
@@ -291,26 +313,28 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(EADatatype newType) {
 		EADatatype oldType = type;
 		type = newType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__TYPE, oldType, type));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -320,6 +344,7 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -329,23 +354,26 @@ public class UserAttributeDefinitionImpl extends EAElementImpl implements UserAt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_DEFINITION__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (defaultValue: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeElementTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeElementTypeImpl.java
index eeab692e75c..7dd2f25b22a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeElementTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeElementTypeImpl.java
@@ -36,20 +36,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesP
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getExtendedElementType <em>Extended Element Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getValidFor <em>Valid For</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getExtendedElementType <em>Extended Element
+ * Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getAttribute <em>Attribute</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeElementTypeImpl#getValidFor <em>Valid For</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UserAttributeElementTypeImpl extends EAElementImpl implements UserAttributeElementType {
+
 	/**
 	 * The cached value of the '{@link #getExtendedElementType() <em>Extended Element Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExtendedElementType()
 	 * @generated
 	 * @ordered
@@ -60,6 +63,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	 * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAttribute()
 	 * @generated
 	 * @ordered
@@ -70,6 +74,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -80,6 +85,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	 * The default value of the '{@link #getValidFor() <em>Valid For</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValidFor()
 	 * @generated
 	 * @ordered
@@ -90,6 +96,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	 * The cached value of the '{@link #getValidFor() <em>Valid For</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValidFor()
 	 * @generated
 	 * @ordered
@@ -99,6 +106,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UserAttributeElementTypeImpl() {
@@ -108,6 +116,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeElementType basicGetExtendedElementType() {
@@ -117,21 +126,24 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
-				if (resolve) return getExtendedElementType();
-				return basicGetExtendedElementType();
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
-				return getAttribute();
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
-				return getValidFor();
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
+			if(resolve)
+				return getExtendedElementType();
+			return basicGetExtendedElementType();
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
+			return getAttribute();
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
+			return getValidFor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -139,19 +151,20 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
-				return extendedElementType != null;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
-				return attribute != null && !attribute.isEmpty();
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
-				return base_Class != null;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
-				return VALID_FOR_EDEFAULT == null ? validFor != null : !VALID_FOR_EDEFAULT.equals(validFor);
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
+			return extendedElementType != null;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
+			return attribute != null && !attribute.isEmpty();
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
+			return base_Class != null;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
+			return VALID_FOR_EDEFAULT == null ? validFor != null : !VALID_FOR_EDEFAULT.equals(validFor);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -159,25 +172,26 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
-				setExtendedElementType((UserAttributeElementType)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
-				getAttribute().clear();
-				getAttribute().addAll((Collection<? extends UserAttributeDefinition>)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
-				setValidFor((String)newValue);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
+			setExtendedElementType((UserAttributeElementType)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
+			getAttribute().clear();
+			getAttribute().addAll((Collection<? extends UserAttributeDefinition>)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
+			setValidFor((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -185,6 +199,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,23 +210,24 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
-				setExtendedElementType((UserAttributeElementType)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
-				getAttribute().clear();
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
-				setValidFor(VALID_FOR_EDEFAULT);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE:
+			setExtendedElementType((UserAttributeElementType)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE:
+			getAttribute().clear();
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR:
+			setValidFor(VALID_FOR_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -219,10 +235,11 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UserAttributeDefinition> getAttribute() {
-		if (attribute == null) {
+		if(attribute == null) {
 			attribute = new EObjectResolvingEList<UserAttributeDefinition>(UserAttributeDefinition.class, this, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__ATTRIBUTE);
 		}
 		return attribute;
@@ -231,14 +248,15 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -248,6 +266,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -257,26 +276,28 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeElementType getExtendedElementType() {
-		if (extendedElementType != null && extendedElementType.eIsProxy()) {
+		if(extendedElementType != null && extendedElementType.eIsProxy()) {
 			InternalEObject oldExtendedElementType = (InternalEObject)extendedElementType;
 			extendedElementType = (UserAttributeElementType)eResolveProxy(oldExtendedElementType);
-			if (extendedElementType != oldExtendedElementType) {
-				if (eNotificationRequired())
+			if(extendedElementType != oldExtendedElementType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE, oldExtendedElementType, extendedElementType));
 			}
 		}
@@ -286,6 +307,7 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValidFor() {
@@ -295,35 +317,39 @@ public class UserAttributeElementTypeImpl extends EAElementImpl implements UserA
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setExtendedElementType(UserAttributeElementType newExtendedElementType) {
 		UserAttributeElementType oldExtendedElementType = extendedElementType;
 		extendedElementType = newExtendedElementType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__EXTENDED_ELEMENT_TYPE, oldExtendedElementType, extendedElementType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValidFor(String newValidFor) {
 		String oldValidFor = validFor;
 		validFor = newValidFor;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE__VALID_FOR, oldValidFor, validFor));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (validFor: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeValueImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeValueImpl.java
index 27c4381054d..587a77f8614 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeValueImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeValueImpl.java
@@ -33,20 +33,22 @@ import org.eclipse.uml2.uml.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getBase_Property <em>Base Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getDefinition <em>Definition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeValueImpl#getDefinition <em>Definition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UserAttributeValueImpl extends EAElementImpl implements UserAttributeValue {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -57,6 +59,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -77,6 +81,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
@@ -87,6 +92,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDefinition()
 	 * @generated
 	 * @ordered
@@ -96,6 +102,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UserAttributeValueImpl() {
@@ -105,22 +112,26 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
-				return getValue();
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
+			return getValue();
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
+			if(resolve)
+				return getDefinition();
+			return basicGetDefinition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -128,19 +139,20 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
-				return base_Class != null;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
-				return base_Property != null;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
-				return definition != null;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
+			return base_Class != null;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
+			return base_Property != null;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
+			return definition != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -148,23 +160,24 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
-				setValue((String)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
-				setDefinition((UserAttributeDefinition)newValue);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
+			setValue((String)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
+			setDefinition((UserAttributeDefinition)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -172,6 +185,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,14 +196,15 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -199,6 +214,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -208,35 +224,37 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
-				setDefinition((UserAttributeDefinition)null);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION:
+			setDefinition((UserAttributeDefinition)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -244,6 +262,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -253,14 +272,15 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeDefinition getDefinition() {
-		if (definition != null && definition.eIsProxy()) {
+		if(definition != null && definition.eIsProxy()) {
 			InternalEObject oldDefinition = (InternalEObject)definition;
 			definition = (UserAttributeDefinition)eResolveProxy(oldDefinition);
-			if (definition != oldDefinition) {
-				if (eNotificationRequired())
+			if(definition != oldDefinition) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION, oldDefinition, definition));
 			}
 		}
@@ -270,6 +290,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeDefinition basicGetDefinition() {
@@ -279,38 +300,41 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinition(UserAttributeDefinition newDefinition) {
 		UserAttributeDefinition oldDefinition = definition;
 		definition = newDefinition;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_VALUE__DEFINITION, oldDefinition, definition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_VALUE__VALUE, oldValue, value));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -320,6 +344,7 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -329,23 +354,26 @@ public class UserAttributeValueImpl extends EAElementImpl implements UserAttribu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTE_VALUE__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeableElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeableElementImpl.java
index 897062db411..6bf169e99b1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeableElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserAttributeableElementImpl.java
@@ -38,20 +38,24 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getUaValue <em>Ua Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getUaType <em>Ua Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getAttributedElement <em>Attributed Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getUaValue <em>Ua Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getUaType <em>Ua Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getAttributedElement <em>Attributed Element
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.impl.UserAttributeableElementImpl#getBase_NamedElement <em>Base Named Element
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UserAttributeableElementImpl extends EObjectImpl implements UserAttributeableElement {
+
 	/**
 	 * The cached value of the '{@link #getUaValue() <em>Ua Value</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUaValue()
 	 * @generated
 	 * @ordered
@@ -62,6 +66,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	 * The cached value of the '{@link #getUaType() <em>Ua Type</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUaType()
 	 * @generated
 	 * @ordered
@@ -72,6 +77,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	 * The cached value of the '{@link #getAttributedElement() <em>Attributed Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAttributedElement()
 	 * @generated
 	 * @ordered
@@ -82,6 +88,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 * @ordered
@@ -91,6 +98,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UserAttributeableElementImpl() {
@@ -100,21 +108,24 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
-				return getUaValue();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
-				return getUaType();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
-				if (resolve) return getAttributedElement();
-				return basicGetAttributedElement();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
-				if (resolve) return getBase_NamedElement();
-				return basicGetBase_NamedElement();
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
+			return getUaValue();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
+			return getUaType();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
+			if(resolve)
+				return getAttributedElement();
+			return basicGetAttributedElement();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
+			if(resolve)
+				return getBase_NamedElement();
+			return basicGetBase_NamedElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -122,19 +133,20 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
-				return uaValue != null && !uaValue.isEmpty();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
-				return uaType != null && !uaType.isEmpty();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
-				return attributedElement != null;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
-				return base_NamedElement != null;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
+			return uaValue != null && !uaValue.isEmpty();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
+			return uaType != null && !uaType.isEmpty();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
+			return attributedElement != null;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
+			return base_NamedElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -142,26 +154,27 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
-				getUaValue().clear();
-				getUaValue().addAll((Collection<? extends UserAttributeValue>)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
-				getUaType().clear();
-				getUaType().addAll((Collection<? extends UserAttributeElementType>)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
-				setAttributedElement((NamedElement)newValue);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)newValue);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
+			getUaValue().clear();
+			getUaValue().addAll((Collection<? extends UserAttributeValue>)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
+			getUaType().clear();
+			getUaType().addAll((Collection<? extends UserAttributeElementType>)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
+			setAttributedElement((NamedElement)newValue);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -169,6 +182,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,23 +193,24 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
-				getUaValue().clear();
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
-				getUaType().clear();
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
-				setAttributedElement((NamedElement)null);
-				return;
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)null);
-				return;
+		switch(featureID) {
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE:
+			getUaValue().clear();
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE:
+			getUaType().clear();
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT:
+			setAttributedElement((NamedElement)null);
+			return;
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -203,10 +218,11 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UserAttributeElementType> getUaType() {
-		if (uaType == null) {
+		if(uaType == null) {
 			uaType = new EObjectResolvingEList<UserAttributeElementType>(UserAttributeElementType.class, this, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_TYPE);
 		}
 		return uaType;
@@ -215,14 +231,15 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getAttributedElement() {
-		if (attributedElement != null && attributedElement.eIsProxy()) {
+		if(attributedElement != null && attributedElement.eIsProxy()) {
 			InternalEObject oldAttributedElement = (InternalEObject)attributedElement;
 			attributedElement = (NamedElement)eResolveProxy(oldAttributedElement);
-			if (attributedElement != oldAttributedElement) {
-				if (eNotificationRequired())
+			if(attributedElement != oldAttributedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT, oldAttributedElement, attributedElement));
 			}
 		}
@@ -232,6 +249,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetAttributedElement() {
@@ -241,26 +259,28 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAttributedElement(NamedElement newAttributedElement) {
 		NamedElement oldAttributedElement = attributedElement;
 		attributedElement = newAttributedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__ATTRIBUTED_ELEMENT, oldAttributedElement, attributedElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getBase_NamedElement() {
-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {
+		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {
 			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;
 			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);
-			if (base_NamedElement != oldBase_NamedElement) {
-				if (eNotificationRequired())
+			if(base_NamedElement != oldBase_NamedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 			}
 		}
@@ -270,6 +290,7 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetBase_NamedElement() {
@@ -279,22 +300,24 @@ public class UserAttributeableElementImpl extends EObjectImpl implements UserAtt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {
 		NamedElement oldBase_NamedElement = base_NamedElement;
 		base_NamedElement = newBase_NamedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UserAttributeValue> getUaValue() {
-		if (uaValue == null) {
+		if(uaValue == null) {
 			uaValue = new EObjectResolvingEList<UserAttributeValue>(UserAttributeValue.class, this, UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT__UA_VALUE);
 		}
 		return uaValue;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesFactoryImpl.java
index 829d2fb3c00..3b7ef746f8d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.infrastructure.userattributes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue;
@@ -32,12 +33,15 @@ import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesP
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UserattributesFactoryImpl extends EFactoryImpl implements UserattributesFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -50,16 +54,16 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UserattributesFactory init() {
 		try {
 			UserattributesFactory theUserattributesFactory = (UserattributesFactory)EPackage.Registry.INSTANCE.getEFactory(UserattributesPackage.eNS_URI);
-			if (theUserattributesFactory != null) {
+			if(theUserattributesFactory != null) {
 				return theUserattributesFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new UserattributesFactoryImpl();
@@ -69,6 +73,7 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesFactoryImpl() {
@@ -78,23 +83,29 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE: return createUserAttributeElementType();
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION: return createUserAttributeDefinition();
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT: return createUserAttributeableElement();
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE: return createUserAttributeValue();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE:
+			return createUserAttributeElementType();
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION:
+			return createUserAttributeDefinition();
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT:
+			return createUserAttributeableElement();
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE:
+			return createUserAttributeValue();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeDefinition createUserAttributeDefinition() {
@@ -105,6 +116,7 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeableElement createUserAttributeableElement() {
@@ -115,6 +127,7 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeElementType createUserAttributeElementType() {
@@ -125,6 +138,7 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserAttributeValue createUserAttributeValue() {
@@ -135,6 +149,7 @@ public class UserattributesFactoryImpl extends EFactoryImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesPackage getUserattributesPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesPackageImpl.java
index 32e5551277c..0887e14eecd 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/impl/UserattributesPackageImpl.java
@@ -89,6 +89,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UserattributesPackageImpl extends EPackageImpl implements UserattributesPackage {
@@ -96,6 +97,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass userAttributeElementTypeEClass = null;
@@ -103,6 +105,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass userAttributeDefinitionEClass = null;
@@ -110,6 +113,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass userAttributeableElementEClass = null;
@@ -117,6 +121,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass userAttributeValueEClass = null;
@@ -124,6 +129,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -131,16 +137,18 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * 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 UserattributesPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link UserattributesPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static UserattributesPackage init() {
-		if (isInited) return (UserattributesPackage)EPackage.Registry.INSTANCE.getEPackage(UserattributesPackage.eNS_URI);
+		if(isInited)
+			return (UserattributesPackage)EPackage.Registry.INSTANCE.getEPackage(UserattributesPackage.eNS_URI);
 
 		// Obtain or create and register package
 		UserattributesPackageImpl theUserattributesPackage = (UserattributesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UserattributesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UserattributesPackageImpl());
@@ -242,7 +250,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 		// Mark meta-data to indicate it can't be changed
 		theUserattributesPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(UserattributesPackage.eNS_URI, theUserattributesPackage);
 		return theUserattributesPackage;
@@ -251,6 +259,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -258,19 +267,19 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage#eNS_URI
 	 * @see #init()
@@ -281,14 +290,16 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -320,6 +331,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUserAttributeableElement() {
@@ -329,6 +341,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeableElement_UaType() {
@@ -338,6 +351,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeableElement_AttributedElement() {
@@ -347,6 +361,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeableElement_Base_NamedElement() {
@@ -356,6 +371,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeableElement_UaValue() {
@@ -365,6 +381,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUserAttributeDefinition() {
@@ -374,6 +391,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeDefinition_Base_Class() {
@@ -383,6 +401,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUserAttributeDefinition_DefaultValue() {
@@ -392,6 +411,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeDefinition_Type() {
@@ -401,6 +421,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeDefinition_Base_Property() {
@@ -410,6 +431,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUserAttributeElementType() {
@@ -419,6 +441,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeElementType_Attribute() {
@@ -428,6 +451,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeElementType_Base_Class() {
@@ -437,6 +461,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeElementType_ExtendedElementType() {
@@ -446,6 +471,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUserAttributeElementType_ValidFor() {
@@ -455,6 +481,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesFactory getUserattributesFactory() {
@@ -464,6 +491,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUserAttributeValue() {
@@ -473,6 +501,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeValue_Base_Class() {
@@ -482,6 +511,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeValue_Definition() {
@@ -491,6 +521,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUserAttributeValue_Value() {
@@ -500,6 +531,7 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUserAttributeValue_Base_Property() {
@@ -507,14 +539,16 @@ public class UserattributesPackageImpl extends EPackageImpl implements Userattri
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesAdapterFactory.java
index 3da7a5bc24b..5ff3ce8c7fa 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesAdapterFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.infrastructure.userattributes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue;
@@ -32,14 +33,17 @@ import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesP
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage
  * @generated
  */
 public class UserattributesAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static UserattributesPackage modelPackage;
@@ -48,44 +52,51 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected UserattributesSwitch<Adapter> modelSwitch =
-		new UserattributesSwitch<Adapter>() {
-			@Override
-			public Adapter caseUserAttributeElementType(UserAttributeElementType object) {
-				return createUserAttributeElementTypeAdapter();
-			}
-			@Override
-			public Adapter caseUserAttributeDefinition(UserAttributeDefinition object) {
-				return createUserAttributeDefinitionAdapter();
-			}
-			@Override
-			public Adapter caseUserAttributeableElement(UserAttributeableElement object) {
-				return createUserAttributeableElementAdapter();
-			}
-			@Override
-			public Adapter caseUserAttributeValue(UserAttributeValue object) {
-				return createUserAttributeValueAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected UserattributesSwitch<Adapter> modelSwitch = new UserattributesSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseUserAttributeElementType(UserAttributeElementType object) {
+			return createUserAttributeElementTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseUserAttributeDefinition(UserAttributeDefinition object) {
+			return createUserAttributeDefinitionAdapter();
+		}
+
+		@Override
+		public Adapter caseUserAttributeableElement(UserAttributeableElement object) {
+			return createUserAttributeableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseUserAttributeValue(UserAttributeValue object) {
+			return createUserAttributeValueAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UserattributesPackage.eINSTANCE;
 		}
 	}
@@ -94,7 +105,9 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -108,6 +121,7 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -116,11 +130,13 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement <em>User Attributeable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement
+	 * <em>User Attributeable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeableElement
 	 * @generated
@@ -130,11 +146,13 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition <em>User Attribute Definition</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition
+	 * <em>User Attribute Definition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition
 	 * @generated
@@ -144,11 +162,13 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType <em>User Attribute Element Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType
+	 * <em>User Attribute Element Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType
 	 * @generated
@@ -158,11 +178,13 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue <em>User Attribute Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue
+	 * <em>User Attribute Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue
 	 * @generated
@@ -177,6 +199,7 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -190,15 +213,16 @@ public class UserattributesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceFactoryImpl.java
index fc67a4e8767..9dcc5e0e118 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.util.UserattributesResourceImpl
  * @generated
  */
 public class UserattributesResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class UserattributesResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceImpl.java
index ffb088c941b..8ca79874d3a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.util.UserattributesResourceFactoryImpl
  * @generated
  */
 public class UserattributesResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public UserattributesResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesSwitch.java
index a277781f94f..8351a7c18d0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesSwitch.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.infrastructure.userattributes.*;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeDefinition;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeElementType;
 import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserAttributeValue;
@@ -29,21 +30,23 @@ import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesP
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesPackage
  * @generated
  */
 public class UserattributesSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static UserattributesPackage modelPackage;
@@ -52,10 +55,11 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UserattributesPackage.eINSTANCE;
 		}
 	}
@@ -64,6 +68,7 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -79,7 +84,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>User Attributeable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -94,7 +101,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>User Attribute Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -109,7 +118,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>User Attribute Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -124,7 +135,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>User Attribute Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -139,7 +152,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -154,7 +169,9 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -168,40 +185,53 @@ public class UserattributesSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE: {
-				UserAttributeElementType userAttributeElementType = (UserAttributeElementType)theEObject;
-				T result = caseUserAttributeElementType(userAttributeElementType);
-				if (result == null) result = caseEAElement(userAttributeElementType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UserattributesPackage.USER_ATTRIBUTE_DEFINITION: {
-				UserAttributeDefinition userAttributeDefinition = (UserAttributeDefinition)theEObject;
-				T result = caseUserAttributeDefinition(userAttributeDefinition);
-				if (result == null) result = caseEAElement(userAttributeDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT: {
-				UserAttributeableElement userAttributeableElement = (UserAttributeableElement)theEObject;
-				T result = caseUserAttributeableElement(userAttributeableElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UserattributesPackage.USER_ATTRIBUTE_VALUE: {
-				UserAttributeValue userAttributeValue = (UserAttributeValue)theEObject;
-				T result = caseUserAttributeValue(userAttributeValue);
-				if (result == null) result = caseEAElement(userAttributeValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case UserattributesPackage.USER_ATTRIBUTE_ELEMENT_TYPE:
+		{
+			UserAttributeElementType userAttributeElementType = (UserAttributeElementType)theEObject;
+			T result = caseUserAttributeElementType(userAttributeElementType);
+			if(result == null)
+				result = caseEAElement(userAttributeElementType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UserattributesPackage.USER_ATTRIBUTE_DEFINITION:
+		{
+			UserAttributeDefinition userAttributeDefinition = (UserAttributeDefinition)theEObject;
+			T result = caseUserAttributeDefinition(userAttributeDefinition);
+			if(result == null)
+				result = caseEAElement(userAttributeDefinition);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UserattributesPackage.USER_ATTRIBUTEABLE_ELEMENT:
+		{
+			UserAttributeableElement userAttributeableElement = (UserAttributeableElement)theEObject;
+			T result = caseUserAttributeableElement(userAttributeableElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UserattributesPackage.USER_ATTRIBUTE_VALUE:
+		{
+			UserAttributeValue userAttributeValue = (UserAttributeValue)theEObject;
+			T result = caseUserAttributeValue(userAttributeValue);
+			if(result == null)
+				result = caseEAElement(userAttributeValue);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesXMLProcessor.java
index e830b79d0c9..8f63c4e6da2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/userattributes/util/UserattributesXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.userattributes.UserattributesP
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UserattributesXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class UserattributesXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UserattributesXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		UserattributesPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the UserattributesResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new UserattributesResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new UserattributesResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceFactoryImpl.java
index 21dea0f6947..a626eac9396 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceFactoryImpl.java
@@ -23,14 +23,17 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.util.InfrastructureResourceImpl
  * @generated
  */
 public class InfrastructureResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InfrastructureResourceFactoryImpl() {
@@ -41,6 +44,7 @@ public class InfrastructureResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceImpl.java
index 9c606fcdc79..e916510c600 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.infrastructure.util.InfrastructureResourceFactoryImpl
  * @generated
  */
 public class InfrastructureResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public InfrastructureResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureXMLProcessor.java
index 9b17cf0f6a5..704f8e55f65 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/infrastructure/util/InfrastructureXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.InfrastructurePackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InfrastructureXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class InfrastructureXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InfrastructureXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		InfrastructurePackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the InfrastructureResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new InfrastructureResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new InfrastructureResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangeFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangeFactory.java
index ce60743a73b..cfe50478bab 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangeFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangeFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each
  * non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage
  * @generated
  */
@@ -28,6 +29,7 @@ public interface InterchangeFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	InterchangeFactory eINSTANCE = org.eclipse.papyrus.eastadl.interchange.impl.InterchangeFactoryImpl.init();
@@ -36,6 +38,7 @@ public interface InterchangeFactory extends EFactory {
 	 * Returns a new object of class '<em>RIF Export Area</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>RIF Export Area</em>'.
 	 * @generated
 	 */
@@ -45,6 +48,7 @@ public interface InterchangeFactory extends EFactory {
 	 * Returns a new object of class '<em>RIF Import Area</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>RIF Import Area</em>'.
 	 * @generated
 	 */
@@ -53,6 +57,7 @@ public interface InterchangeFactory extends EFactory {
 	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangePackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangePackage.java
index 82920e86cf9..a2d10bf97b9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangePackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/InterchangePackage.java
@@ -32,8 +32,10 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The interchange part of an EAST-ADL2 system model is for exchanging model data with external stakeholders. E.g. it provides elements (see RIFArea) for importing resp. exporting requirements specifications into resp. out of an EAST-ADL2 system model.
+ * The interchange part of an EAST-ADL2 system model is for exchanging model data with external stakeholders. E.g. it provides elements (see RIFArea)
+ * for importing resp. exporting requirements specifications into resp. out of an EAST-ADL2 system model.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangeFactory
  * @model kind="package"
  * @generated
@@ -49,6 +51,7 @@ public interface InterchangePackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -56,6 +59,7 @@ public interface InterchangePackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl <em>RIF Area</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFArea()
 		 * @generated
@@ -66,6 +70,7 @@ public interface InterchangePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Root Requirement Container</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RIF_AREA__ROOT_REQUIREMENT_CONTAINER = eINSTANCE.getRIFArea_RootRequirementContainer();
@@ -82,6 +87,7 @@ public interface InterchangePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Interchange Req Spec Object</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT = eINSTANCE.getRIFArea_InterchangeReqSpecObject();
@@ -89,6 +95,7 @@ public interface InterchangePackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFExportAreaImpl <em>RIF Export Area</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFExportAreaImpl
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFExportArea()
 		 * @generated
@@ -98,6 +105,7 @@ public interface InterchangePackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFImportAreaImpl <em>RIF Import Area</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFImportAreaImpl
 		 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFImportArea()
 		 * @generated
@@ -109,6 +117,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "interchange";
@@ -116,6 +125,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Interchange/1";
@@ -123,6 +133,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Interchange";
@@ -130,6 +141,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	InterchangePackage eINSTANCE = org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl.init();
@@ -137,6 +149,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl <em>RIF Area</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFArea()
 	 * @generated
@@ -147,6 +160,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -156,6 +170,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -165,6 +180,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -174,6 +190,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -183,6 +200,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -192,6 +210,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Root Requirement Container</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -201,6 +220,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -210,6 +230,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Interchange Req Spec Object</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -219,6 +240,7 @@ public interface InterchangePackage extends EPackage {
 	 * The number of structural features of the '<em>RIF Area</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -227,6 +249,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFExportAreaImpl <em>RIF Export Area</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFExportAreaImpl
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFExportArea()
 	 * @generated
@@ -237,6 +260,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -246,6 +270,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -255,6 +280,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -264,6 +290,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -273,6 +300,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -282,6 +310,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Root Requirement Container</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -291,6 +320,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -300,6 +330,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Interchange Req Spec Object</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -317,6 +348,7 @@ public interface InterchangePackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFImportAreaImpl <em>RIF Import Area</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.RIFImportAreaImpl
 	 * @see org.eclipse.papyrus.eastadl.interchange.impl.InterchangePackageImpl#getRIFImportArea()
 	 * @generated
@@ -327,6 +359,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -336,6 +369,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -345,6 +379,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -354,6 +389,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -363,6 +399,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -372,6 +409,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Root Requirement Container</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -381,6 +419,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -390,6 +429,7 @@ public interface InterchangePackage extends EPackage {
 	 * The feature id for the '<em><b>Interchange Req Spec Object</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -408,6 +448,7 @@ public interface InterchangePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea <em>RIF Area</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>RIF Area</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFArea
 	 * @generated
@@ -415,9 +456,11 @@ public interface InterchangePackage extends EPackage {
 	EClass getRIFArea();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getRootRequirementContainer <em>Root Requirement Container</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getRootRequirementContainer
+	 * <em>Root Requirement Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Root Requirement Container</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFArea#getRootRequirementContainer()
 	 * @see #getRIFArea()
@@ -429,6 +472,7 @@ public interface InterchangePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFArea#getBase_Class()
 	 * @see #getRIFArea()
@@ -437,9 +481,11 @@ public interface InterchangePackage extends EPackage {
 	EReference getRIFArea_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getInterchangeReqSpecObject <em>Interchange Req Spec Object</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getInterchangeReqSpecObject
+	 * <em>Interchange Req Spec Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Interchange Req Spec Object</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFArea#getInterchangeReqSpecObject()
 	 * @see #getRIFArea()
@@ -451,6 +497,7 @@ public interface InterchangePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.interchange.RIFExportArea <em>RIF Export Area</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>RIF Export Area</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFExportArea
 	 * @generated
@@ -461,6 +508,7 @@ public interface InterchangePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.interchange.RIFImportArea <em>RIF Import Area</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>RIF Import Area</em>'.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFImportArea
 	 * @generated
@@ -471,6 +519,7 @@ public interface InterchangePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFArea.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFArea.java
index ed91d6ddbd9..4d6bd6c2432 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFArea.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFArea.java
@@ -24,24 +24,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>RIF Area</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * An extra allocated part of the EAST-ADL2 System Model that contains Requirement Specific Data (Container, Reqs etc...) from RIF Import resp. RIF Export.
+ * An extra allocated part of the EAST-ADL2 System Model that contains Requirement Specific Data (Container, Reqs etc...) from RIF Import resp. RIF
+ * Export.
  * 
- * Especially for the context of requirement engineering and considering the possibility to import/export requirement related data via RIF, the feature uuid will be used to check that two elements are semantically the same and thus should stay together in reference via a Multi-Level reference link.
+ * Especially for the context of requirement engineering and considering the possibility to import/export requirement related data via RIF, the
+ * feature uuid will be used to check that two elements are semantically the same and thus should stay together in reference via a Multi-Level
+ * reference link.
  * 
- * Since requirement data to be imported/exported will be put into RIFArea, requirement data elements which are not inside RIFArea and have semantically equal element in the RIFAreas (such elements have the same uuid value) will be connected with the appropriate elements in the RIFArea using Multi-Level reference links.
+ * Since requirement data to be imported/exported will be put into RIFArea, requirement data elements which are not inside RIFArea and have
+ * semantically equal element in the RIFAreas (such elements have the same uuid value) will be connected with the appropriate elements in the RIFArea
+ * using Multi-Level reference links.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getRootRequirementContainer <em>Root Requirement Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getInterchangeReqSpecObject <em>Interchange Req Spec Object</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getRootRequirementContainer <em>Root Requirement Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getInterchangeReqSpecObject <em>Interchange Req Spec Object</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFArea()
  * @model abstract="true"
  * @generated
@@ -52,10 +57,10 @@ public interface RIFArea extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFArea_Base_Class()
@@ -69,10 +74,10 @@ public interface RIFArea extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Interchange Req Spec Object</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Interchange Req Spec Object</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Interchange Req Spec Object</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFArea_InterchangeReqSpecObject()
 	 * @model ordered="false"
@@ -85,10 +90,10 @@ public interface RIFArea extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Root Requirement Container</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Root Requirement Container</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Root Requirement Container</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFArea_RootRequirementContainer()
 	 * @model
@@ -99,7 +104,9 @@ public interface RIFArea extends Context {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.interchange.RIFArea#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFExportArea.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFExportArea.java
index baddea6e6ad..6cd18176770 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFExportArea.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFExportArea.java
@@ -18,12 +18,12 @@ package org.eclipse.papyrus.eastadl.interchange;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>RIF Export Area</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Contains (clones of) requirement specific data to be exported in RIF format.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFExportArea()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFImportArea.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFImportArea.java
index 08ef5f7d243..93e4620fa88 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFImportArea.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/RIFImportArea.java
@@ -18,14 +18,15 @@ package org.eclipse.papyrus.eastadl.interchange;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>RIF Import Area</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Contains requirement specific data to be imported from an external RIF file.
  * 
- * If an element will be imported from external the uuid will be taken from the given external exchange data file, because the identifier is global unique and shall not be changed somewhere.
+ * If an element will be imported from external the uuid will be taken from the given external exchange data file, because the identifier is global
+ * unique and shall not be changed somewhere.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#getRIFImportArea()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangeFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangeFactoryImpl.java
index 0d386f2ffd9..62a3e600578 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangeFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangeFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.interchange.*;
 import org.eclipse.papyrus.eastadl.interchange.InterchangeFactory;
 import org.eclipse.papyrus.eastadl.interchange.InterchangePackage;
 import org.eclipse.papyrus.eastadl.interchange.RIFExportArea;
@@ -28,12 +29,14 @@ import org.eclipse.papyrus.eastadl.interchange.RIFImportArea;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -45,16 +48,16 @@ public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeF
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static InterchangeFactory init() {
 		try {
 			InterchangeFactory theInterchangeFactory = (InterchangeFactory)EPackage.Registry.INSTANCE.getEFactory(InterchangePackage.eNS_URI);
-			if (theInterchangeFactory != null) {
+			if(theInterchangeFactory != null) {
 				return theInterchangeFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new InterchangeFactoryImpl();
@@ -63,6 +66,7 @@ public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeF
 	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeFactoryImpl() {
@@ -71,21 +75,25 @@ public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeF
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case InterchangePackage.RIF_EXPORT_AREA: return createRIFExportArea();
-			case InterchangePackage.RIF_IMPORT_AREA: return createRIFImportArea();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case InterchangePackage.RIF_EXPORT_AREA:
+			return createRIFExportArea();
+		case InterchangePackage.RIF_IMPORT_AREA:
+			return createRIFImportArea();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RIFExportArea createRIFExportArea() {
@@ -96,6 +104,7 @@ public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeF
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RIFImportArea createRIFImportArea() {
@@ -105,6 +114,7 @@ public class InterchangeFactoryImpl extends EFactoryImpl implements InterchangeF
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangePackage getInterchangePackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangePackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangePackageImpl.java
index 8c3ae19e5e7..90a14f760e0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangePackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/InterchangePackageImpl.java
@@ -84,12 +84,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InterchangePackageImpl extends EPackageImpl implements InterchangePackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -97,16 +99,18 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * 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 InterchangePackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link InterchangePackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static InterchangePackage init() {
-		if (isInited) return (InterchangePackage)EPackage.Registry.INSTANCE.getEPackage(InterchangePackage.eNS_URI);
+		if(isInited)
+			return (InterchangePackage)EPackage.Registry.INSTANCE.getEPackage(InterchangePackage.eNS_URI);
 
 		// Obtain or create and register package
 		InterchangePackageImpl theInterchangePackage = (InterchangePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InterchangePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InterchangePackageImpl());
@@ -208,7 +212,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 		// Mark meta-data to indicate it can't be changed
 		theInterchangePackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(InterchangePackage.eNS_URI, theInterchangePackage);
 		return theInterchangePackage;
@@ -217,6 +221,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRIFArea() {
@@ -226,6 +231,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRIFArea_RootRequirementContainer() {
@@ -235,6 +241,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRIFArea_Base_Class() {
@@ -244,6 +251,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRIFArea_InterchangeReqSpecObject() {
@@ -253,6 +261,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRIFExportArea() {
@@ -262,6 +271,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRIFImportArea() {
@@ -270,43 +280,47 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rifAreaEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rifExportAreaEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rifImportAreaEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage#eNS_URI
 	 * @see #init()
@@ -317,13 +331,15 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -339,6 +355,7 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeFactory getInterchangeFactory() {
@@ -346,13 +363,15 @@ public class InterchangePackageImpl extends EPackageImpl implements InterchangeP
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFAreaImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFAreaImpl.java
index 62b5729a2bf..e5361e2ccc8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFAreaImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFAreaImpl.java
@@ -36,12 +36,12 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsContainer;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getRootRequirementContainer <em>Root Requirement Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getInterchangeReqSpecObject <em>Interchange Req Spec Object</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getRootRequirementContainer <em>Root Requirement Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.interchange.impl.RIFAreaImpl#getInterchangeReqSpecObject <em>Interchange Req Spec Object</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
@@ -50,6 +50,7 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 	 * The cached value of the '{@link #getRootRequirementContainer() <em>Root Requirement Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRootRequirementContainer()
 	 * @generated
 	 * @ordered
@@ -70,6 +71,7 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 	 * The cached value of the '{@link #getInterchangeReqSpecObject() <em>Interchange Req Spec Object</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getInterchangeReqSpecObject()
 	 * @generated
 	 * @ordered
@@ -78,6 +80,7 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RIFAreaImpl() {
@@ -86,6 +89,7 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -94,64 +98,69 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
-				return getRootRequirementContainer();
-			case InterchangePackage.RIF_AREA__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
-				return getInterchangeReqSpecObject();
+		switch(featureID) {
+		case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
+			return getRootRequirementContainer();
+		case InterchangePackage.RIF_AREA__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
+			return getInterchangeReqSpecObject();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
-				return rootRequirementContainer != null && !rootRequirementContainer.isEmpty();
-			case InterchangePackage.RIF_AREA__BASE_CLASS:
-				return base_Class != null;
-			case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
-				return interchangeReqSpecObject != null && !interchangeReqSpecObject.isEmpty();
+		switch(featureID) {
+		case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
+			return rootRequirementContainer != null && !rootRequirementContainer.isEmpty();
+		case InterchangePackage.RIF_AREA__BASE_CLASS:
+			return base_Class != null;
+		case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
+			return interchangeReqSpecObject != null && !interchangeReqSpecObject.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
-				getRootRequirementContainer().clear();
-				getRootRequirementContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
-				return;
-			case InterchangePackage.RIF_AREA__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
-				getInterchangeReqSpecObject().clear();
-				getInterchangeReqSpecObject().addAll((Collection<? extends RequirementSpecificationObject>)newValue);
-				return;
+		switch(featureID) {
+		case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
+			getRootRequirementContainer().clear();
+			getRootRequirementContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
+			return;
+		case InterchangePackage.RIF_AREA__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
+			getInterchangeReqSpecObject().clear();
+			getInterchangeReqSpecObject().addAll((Collection<? extends RequirementSpecificationObject>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,34 +170,36 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
-				getRootRequirementContainer().clear();
-				return;
-			case InterchangePackage.RIF_AREA__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
-				getInterchangeReqSpecObject().clear();
-				return;
+		switch(featureID) {
+		case InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER:
+			getRootRequirementContainer().clear();
+			return;
+		case InterchangePackage.RIF_AREA__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT:
+			getInterchangeReqSpecObject().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InterchangePackage.RIF_AREA__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -198,10 +209,11 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementSpecificationObject> getInterchangeReqSpecObject() {
-		if (interchangeReqSpecObject == null) {
+		if(interchangeReqSpecObject == null) {
 			interchangeReqSpecObject = new EObjectResolvingEList<RequirementSpecificationObject>(RequirementSpecificationObject.class, this, InterchangePackage.RIF_AREA__INTERCHANGE_REQ_SPEC_OBJECT);
 		}
 		return interchangeReqSpecObject;
@@ -210,10 +222,11 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsContainer> getRootRequirementContainer() {
-		if (rootRequirementContainer == null) {
+		if(rootRequirementContainer == null) {
 			rootRequirementContainer = new EObjectResolvingEList<RequirementsContainer>(RequirementsContainer.class, this, InterchangePackage.RIF_AREA__ROOT_REQUIREMENT_CONTAINER);
 		}
 		return rootRequirementContainer;
@@ -221,12 +234,13 @@ public abstract class RIFAreaImpl extends ContextImpl implements RIFArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, InterchangePackage.RIF_AREA__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFExportAreaImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFExportAreaImpl.java
index a22da624a95..a2ba14b7e9f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFExportAreaImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFExportAreaImpl.java
@@ -25,13 +25,14 @@ import org.eclipse.papyrus.eastadl.interchange.RIFExportArea;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class RIFExportAreaImpl extends RIFAreaImpl implements RIFExportArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RIFExportAreaImpl() {
@@ -40,6 +41,7 @@ public class RIFExportAreaImpl extends RIFAreaImpl implements RIFExportArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFImportAreaImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFImportAreaImpl.java
index 33d32bc3bfd..f59743c2e00 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFImportAreaImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/impl/RIFImportAreaImpl.java
@@ -25,13 +25,14 @@ import org.eclipse.papyrus.eastadl.interchange.RIFImportArea;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class RIFImportAreaImpl extends RIFAreaImpl implements RIFImportArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RIFImportAreaImpl() {
@@ -40,6 +41,7 @@ public class RIFImportAreaImpl extends RIFAreaImpl implements RIFImportArea {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeAdapterFactory.java
index c8af0372f5c..88b4012254a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.interchange.*;
 import org.eclipse.papyrus.eastadl.interchange.InterchangePackage;
 import org.eclipse.papyrus.eastadl.interchange.RIFArea;
 import org.eclipse.papyrus.eastadl.interchange.RIFExportArea;
@@ -28,8 +29,9 @@ import org.eclipse.papyrus.eastadl.interchange.RIFImportArea;
 
 
 /**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage
  * @generated
  */
@@ -38,6 +40,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static InterchangePackage modelPackage;
@@ -46,42 +49,50 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected InterchangeSwitch<Adapter> modelSwitch = new InterchangeSwitch<Adapter>() {
-			@Override
-			public Adapter caseRIFArea(RIFArea object) {
-				return createRIFAreaAdapter();
-			}
-			@Override
-			public Adapter caseRIFExportArea(RIFExportArea object) {
-				return createRIFExportAreaAdapter();
-			}
-			@Override
-			public Adapter caseRIFImportArea(RIFImportArea object) {
-				return createRIFImportAreaAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter caseRIFArea(RIFArea object) {
+			return createRIFAreaAdapter();
+		}
+
+		@Override
+		public Adapter caseRIFExportArea(RIFExportArea object) {
+			return createRIFExportAreaAdapter();
+		}
+
+		@Override
+		public Adapter caseRIFImportArea(RIFImportArea object) {
+			return createRIFImportAreaAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = InterchangePackage.eINSTANCE;
 		}
 	}
@@ -89,7 +100,9 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -104,6 +117,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFArea
 	 * @generated
@@ -118,6 +132,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFExportArea
 	 * @generated
@@ -132,6 +147,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.interchange.RIFImportArea
 	 * @generated
@@ -146,6 +162,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -160,6 +177,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -172,6 +190,7 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This default
 	 * implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -184,15 +203,16 @@ public class InterchangeAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc
 	 * --> This implementation returns <code>true</code> if the object is either the model's package
 	 * or is an instance object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceFactoryImpl.java
index 0b37ea4c7c6..9282c05b868 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**
  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--
  * end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.util.InterchangeResourceImpl
  * @generated
  */
@@ -31,6 +32,7 @@ public class InterchangeResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeResourceFactoryImpl() {
@@ -40,6 +42,7 @@ public class InterchangeResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceImpl.java
index 4b1429c48ad..3f92793ca6c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.util.InterchangeResourceFactoryImpl
  * @generated
  */
@@ -28,7 +29,9 @@ public class InterchangeResourceImpl extends XMLResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public InterchangeResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeSwitch.java
index 8c9589415c2..acd1b2243a1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.interchange.*;
 import org.eclipse.papyrus.eastadl.interchange.InterchangePackage;
 import org.eclipse.papyrus.eastadl.interchange.RIFArea;
 import org.eclipse.papyrus.eastadl.interchange.RIFExportArea;
@@ -32,6 +33,7 @@ import org.eclipse.papyrus.eastadl.interchange.RIFImportArea;
  * each class of the model, starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.interchange.InterchangePackage
  * @generated
  */
@@ -40,6 +42,7 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static InterchangePackage modelPackage;
@@ -47,10 +50,11 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	/**
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = InterchangePackage.eINSTANCE;
 		}
 	}
@@ -59,6 +63,7 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -74,7 +79,9 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -89,7 +96,7 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -102,39 +109,55 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	/**
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case InterchangePackage.RIF_AREA: {
-				RIFArea rifArea = (RIFArea)theEObject;
-				T result = caseRIFArea(rifArea);
-				if (result == null) result = caseContext(rifArea);
-				if (result == null) result = caseEAElement(rifArea);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case InterchangePackage.RIF_EXPORT_AREA: {
-				RIFExportArea rifExportArea = (RIFExportArea)theEObject;
-				T result = caseRIFExportArea(rifExportArea);
-				if (result == null) result = caseRIFArea(rifExportArea);
-				if (result == null) result = caseContext(rifExportArea);
-				if (result == null) result = caseEAElement(rifExportArea);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case InterchangePackage.RIF_IMPORT_AREA: {
-				RIFImportArea rifImportArea = (RIFImportArea)theEObject;
-				T result = caseRIFImportArea(rifImportArea);
-				if (result == null) result = caseRIFArea(rifImportArea);
-				if (result == null) result = caseContext(rifImportArea);
-				if (result == null) result = caseEAElement(rifImportArea);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case InterchangePackage.RIF_AREA:
+		{
+			RIFArea rifArea = (RIFArea)theEObject;
+			T result = caseRIFArea(rifArea);
+			if(result == null)
+				result = caseContext(rifArea);
+			if(result == null)
+				result = caseEAElement(rifArea);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case InterchangePackage.RIF_EXPORT_AREA:
+		{
+			RIFExportArea rifExportArea = (RIFExportArea)theEObject;
+			T result = caseRIFExportArea(rifExportArea);
+			if(result == null)
+				result = caseRIFArea(rifExportArea);
+			if(result == null)
+				result = caseContext(rifExportArea);
+			if(result == null)
+				result = caseEAElement(rifExportArea);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case InterchangePackage.RIF_IMPORT_AREA:
+		{
+			RIFImportArea rifImportArea = (RIFImportArea)theEObject;
+			T result = caseRIFImportArea(rifImportArea);
+			if(result == null)
+				result = caseRIFArea(rifImportArea);
+			if(result == null)
+				result = caseContext(rifImportArea);
+			if(result == null)
+				result = caseEAElement(rifImportArea);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -144,7 +167,9 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>RIF Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -159,7 +184,9 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>RIF Export Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -174,7 +201,9 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>RIF Import Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -189,7 +218,9 @@ public class InterchangeSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeXMLProcessor.java
index c7cee0db8ab..915b4572e61 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/interchange/util/InterchangeXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.interchange.InterchangePackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class InterchangeXMLProcessor extends XMLProcessor {
@@ -34,6 +35,7 @@ public class InterchangeXMLProcessor extends XMLProcessor {
 	/**
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InterchangeXMLProcessor() {
@@ -49,7 +51,7 @@ public class InterchangeXMLProcessor extends XMLProcessor {
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new InterchangeResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new InterchangeResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Actor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Actor.java
index 0657a4daf5a..a85b9037ce8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Actor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Actor.java
@@ -21,27 +21,28 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Actor</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Actor#getBase_Actor <em>Base Actor</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Actor#getBase_Actor <em>Base Actor</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getActor()

  * @model

  * @generated

  */

 public interface Actor extends TraceableSpecification {

+

 	/**

 	 * Returns the value of the '<em><b>Base Actor</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Actor</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Actor</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Actor</em>' reference.

 	 * @see #setBase_Actor(org.eclipse.uml2.uml.Actor)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getActor_Base_Actor()

@@ -54,7 +55,9 @@ public interface Actor extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Actor#getBase_Actor <em>Base Actor</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Actor</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Actor</em>' reference.

 	 * @see #getBase_Actor()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/DeriveRequirement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/DeriveRequirement.java
index 7502ef47b14..bb9dab6fbc4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/DeriveRequirement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/DeriveRequirement.java
@@ -22,27 +22,32 @@ import org.eclipse.papyrus.sysml.requirements.DeriveReqt;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Derive Requirement</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ADLDeriveReqt signifies a dependency relationship in-between two sets of ADL requirements, showing the relationship when a set of derived client ADL requirement (client requirement) is derived from a set of ADL requirements (supplier requirement). It inherits from SysML::DeriveReqt which extends Dependency.
+ * ADLDeriveReqt signifies a dependency relationship in-between two sets of ADL requirements, showing the relationship when a set of derived client
+ * ADL requirement (client requirement) is derived from a set of ADL requirements (supplier requirement). It inherits from SysML::DeriveReqt which
+ * extends Dependency.
  * 
  * Semantics:
- * ADLDeriveReqt signifies a derived/derived by relationship between ADLRequirements, where the modification of the supplierADLRequirement may impact the derived client ADLRequirement. ADLDeriveReqt implies the semantics that the derived client ADLRequirement is not complete, without the supplier ADLRequirement.
+ * ADLDeriveReqt signifies a derived/derived by relationship between ADLRequirements, where the modification of the supplierADLRequirement may impact
+ * the derived client ADLRequirement. ADLDeriveReqt implies the semantics that the derived client ADLRequirement is not complete, without the supplier
+ * ADLRequirement.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerived <em>Derived</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerivedFrom <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerived <em>Derived</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerivedFrom <em>Derived From</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getDeriveRequirement()
  * @model
  * @generated
  */
 public interface DeriveRequirement extends RequirementsRelationship, DeriveReqt {
+
 	/**
 	 * Returns the value of the '<em><b>Derived</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
@@ -52,6 +57,7 @@ public interface DeriveRequirement extends RequirementsRelationship, DeriveReqt
 	 * The set of ADL requirements derived from the supplier ADL requirement.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Derived</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getDeriveRequirement_Derived()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -68,6 +74,7 @@ public interface DeriveRequirement extends RequirementsRelationship, DeriveReqt
 	 * The set of ADL requirements that the client ADL requirement are derived from.
 	 * {derived from UML::DirectedRelationship::source}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Derived From</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getDeriveRequirement_DerivedFrom()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Extend.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Extend.java
index 0a9b960b136..4468526dc42 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Extend.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Extend.java
@@ -22,29 +22,30 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Extend</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getBase_Extend <em>Base Extend</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtendedCase <em>Extended Case</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtensionLocation <em>Extension Location</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getBase_Extend <em>Base Extend</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtendedCase <em>Extended Case</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtensionLocation <em>Extension Location</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtend()

  * @model

  * @generated

  */

 public interface Extend extends Relationship {

+

 	/**

 	 * Returns the value of the '<em><b>Base Extend</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Extend</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Extend</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Extend</em>' reference.

 	 * @see #setBase_Extend(org.eclipse.uml2.uml.Extend)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtend_Base_Extend()

@@ -57,7 +58,9 @@ public interface Extend extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getBase_Extend <em>Base Extend</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Extend</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Extend</em>' reference.

 	 * @see #getBase_Extend()

 	 * @generated

 	 */

@@ -67,10 +70,10 @@ public interface Extend extends Relationship {
 	 * Returns the value of the '<em><b>Extended Case</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Extended Case</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Extended Case</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Extended Case</em>' reference.

 	 * @see #setExtendedCase(UseCase)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtend_ExtendedCase()

@@ -83,7 +86,9 @@ public interface Extend extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtendedCase <em>Extended Case</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Extended Case</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Extended Case</em>' reference.

 	 * @see #getExtendedCase()

 	 * @generated

 	 */

@@ -94,10 +99,10 @@ public interface Extend extends Relationship {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Extension Location</em>' reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Extension Location</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Extension Location</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtend_ExtensionLocation()

 	 * @model required="true" ordered="false"

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/ExtensionPoint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/ExtensionPoint.java
index 24e5102c0b1..7e9bbe0680a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/ExtensionPoint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/ExtensionPoint.java
@@ -20,27 +20,28 @@ package org.eclipse.papyrus.eastadl.requirements;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Extension Point</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint <em>Base Extension Point</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint <em>Base Extension Point</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtensionPoint()

  * @model

  * @generated

  */

 public interface ExtensionPoint extends RedefinableElement {

+

 	/**

 	 * Returns the value of the '<em><b>Base Extension Point</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Extension Point</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Extension Point</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Extension Point</em>' reference.

 	 * @see #setBase_ExtensionPoint(org.eclipse.uml2.uml.ExtensionPoint)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getExtensionPoint_Base_ExtensionPoint()

@@ -50,10 +51,13 @@ public interface ExtensionPoint extends RedefinableElement {
 	org.eclipse.uml2.uml.ExtensionPoint getBase_ExtensionPoint();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint <em>Base Extension Point</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint <em>Base Extension Point</em>}'

+	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Extension Point</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Extension Point</em>' reference.

 	 * @see #getBase_ExtensionPoint()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Include.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Include.java
index 85552ac2ae9..0d263818828 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Include.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Include.java
@@ -21,28 +21,29 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Include</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Include#getBase_Include <em>Base Include</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Include#getAddition <em>Addition</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Include#getBase_Include <em>Base Include</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Include#getAddition <em>Addition</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getInclude()

  * @model

  * @generated

  */

 public interface Include extends Relationship {

+

 	/**

 	 * Returns the value of the '<em><b>Base Include</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Include</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Include</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Include</em>' reference.

 	 * @see #setBase_Include(org.eclipse.uml2.uml.Include)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getInclude_Base_Include()

@@ -55,7 +56,9 @@ public interface Include extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Include#getBase_Include <em>Base Include</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Include</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Include</em>' reference.

 	 * @see #getBase_Include()

 	 * @generated

 	 */

@@ -65,10 +68,10 @@ public interface Include extends Relationship {
 	 * Returns the value of the '<em><b>Addition</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Addition</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Addition</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Addition</em>' reference.

 	 * @see #setAddition(UseCase)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getInclude_Addition()

@@ -81,7 +84,9 @@ public interface Include extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Include#getAddition <em>Addition</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Addition</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Addition</em>' reference.

 	 * @see #getAddition()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/OperationalSituation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/OperationalSituation.java
index 1252cbd22f3..41409b1d0b7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/OperationalSituation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/OperationalSituation.java
@@ -21,27 +21,28 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Operational Situation</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getOperationalSituation()
  * @model
  * @generated
  */
 public interface OperationalSituation extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getOperationalSituation_Base_Class()
@@ -54,7 +55,9 @@ public interface OperationalSituation extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirement.java
index 9dee261a6db..db9dcd4adc4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirement.java
@@ -16,26 +16,25 @@
 package org.eclipse.papyrus.eastadl.requirements;

 

 /**

- * <!-- begin-user-doc --> A representation of the model object '<em><b>Quality Requirement</b></em>

- * '. <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Quality Requirement</b></em> '. <!-- end-user-doc -->

+ * 

  * <!-- begin-model-doc -->

  * QualityRequirements are the kind of requirements that are used to introduce externally visible properties of the system considered as a whole.

  * The attribute qualityRequirementType allows a more specific classification.

  * 

  * 

  * 

- * Extension: 

+ * Extension:

  * Class, specializes Requirement

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType <em>Quality Requirement Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType <em>Quality Requirement Type</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getQualityRequirement()

  * @model

  * @generated

@@ -44,12 +43,10 @@ public interface QualityRequirement extends Requirement {
 

 	/**

 	 * Returns the value of the '<em><b>Quality Requirement Type</b></em>' attribute. The default

-	 * value is <code>""</code>. The literals are from the enumeration

-	 * {@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind}. <!--

+	 * value is <code>""</code>. The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind}. <!--

 	 * begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Quality Requirement Type</em>' attribute isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Quality Requirement Type</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

@@ -63,9 +60,12 @@ public interface QualityRequirement extends Requirement {
 	QualityRequirementKind getQualityRequirementType();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType <em>Quality Requirement Type</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType

+	 * <em>Quality Requirement Type</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Quality Requirement Type</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Quality Requirement Type</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind

 	 * @see #getQualityRequirementType()

 	 * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirementKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirementKind.java
index cfa4dfc95f8..13133d423c8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirementKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/QualityRequirementKind.java
@@ -22,8 +22,8 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;

 

 /**

- * <!-- begin-user-doc --> A representation of the literals of the enumeration '

- * <em><b>Quality Requirement Kind</b></em>', and utility methods for working with them. <!--

+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Quality Requirement Kind</b></em>', and utility methods for

+ * working with them. <!--

  * end-user-doc --> <!-- begin-model-doc --> Various types of quality requirements. <!--

  * end-model-doc -->

  * 

@@ -35,6 +35,7 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * The '<em><b>Ergonomy</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #ERGONOMY_VALUE

 	 * @generated

 	 * @ordered

@@ -45,6 +46,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Configurability</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @see #CONFIGURABILITY_VALUE

 	 * @generated

 	 * @ordered

@@ -55,6 +57,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Integrity</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #INTEGRITY_VALUE

 	 * @generated

 	 * @ordered

@@ -62,6 +65,7 @@ public enum QualityRequirementKind implements Enumerator {
 	INTEGRITY(2, "integrity", "integrity"), /**

 	 * The '<em><b>Safety</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #SAFETY_VALUE

 	 * @generated

 	 * @ordered

@@ -71,6 +75,7 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * The '<em><b>Other</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #OTHER_VALUE

 	 * @generated

 	 * @ordered

@@ -80,6 +85,7 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * The '<em><b>Security</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #SECURITY_VALUE

 	 * @generated

 	 * @ordered

@@ -90,6 +96,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Human Machine Interface</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #HUMAN_MACHINE_INTERFACE_VALUE

 	 * @generated

 	 * @ordered

@@ -98,6 +105,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Timing</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #TIMING_VALUE

 	 * @generated

 	 * @ordered

@@ -106,6 +114,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Availability</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #AVAILABILITY_VALUE

 	 * @generated

 	 * @ordered

@@ -114,6 +123,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Reliability</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #RELIABILITY_VALUE

 	 * @generated

 	 * @ordered

@@ -122,6 +132,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Confidentiality</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #CONFIDENTIALITY_VALUE

 	 * @generated

 	 * @ordered

@@ -130,6 +141,7 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Maintainability</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #MAINTAINABILITY_VALUE

 	 * @generated

 	 * @ordered

@@ -140,10 +152,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Ergonomy</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Ergonomy</b></em>' literal object isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of '<em><b>Ergonomy</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #ERGONOMY

 	 * @model name="ergonomy"

 	 * @generated

@@ -155,10 +167,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Configurability</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Configurability</b></em>' literal object isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of '<em><b>Configurability</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #CONFIGURABILITY

 	 * @model name="configurability"

 	 * @generated

@@ -170,10 +182,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Integrity</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Integrity</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Integrity</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #INTEGRITY

 	 * @model name="integrity"

 	 * @generated

@@ -185,10 +197,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Safety</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Safety</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>Safety</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #SAFETY

 	 * @model name="safety"

 	 * @generated

@@ -200,10 +212,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Other</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Other</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>Other</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #OTHER

 	 * @model name="other"

 	 * @generated

@@ -215,10 +227,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Security</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Security</b></em>' literal object isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of '<em><b>Security</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #SECURITY

 	 * @model name="security"

 	 * @generated

@@ -230,10 +242,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Human Machine Interface</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Human Machine Interface</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Human Machine Interface</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #HUMAN_MACHINE_INTERFACE

 	 * @model name="humanMachineInterface"

 	 * @generated

@@ -245,10 +257,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Timing</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Timing</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>Timing</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #TIMING

 	 * @model name="timing"

 	 * @generated

@@ -260,10 +272,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Availability</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Availability</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Availability</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #AVAILABILITY

 	 * @model name="availability"

 	 * @generated

@@ -275,10 +287,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Reliability</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Reliability</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Reliability</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #RELIABILITY

 	 * @model name="reliability"

 	 * @generated

@@ -290,10 +302,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Confidentiality</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Confidentiality</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Confidentiality</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #CONFIDENTIALITY

 	 * @model name="confidentiality"

 	 * @generated

@@ -305,10 +317,10 @@ public enum QualityRequirementKind implements Enumerator {
 	 * The '<em><b>Maintainability</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Maintainability</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of '<em><b>Maintainability</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #MAINTAINABILITY

 	 * @model name="maintainability"

 	 * @generated

@@ -322,24 +334,12 @@ public enum QualityRequirementKind implements Enumerator {
 	 * 

 	 * @generated

 	 */

-	private static final QualityRequirementKind[] VALUES_ARRAY = new QualityRequirementKind[] {

-			ERGONOMY,

-			CONFIGURABILITY,

-			INTEGRITY,

-			SAFETY,

-			OTHER,

-			SECURITY,

-			HUMAN_MACHINE_INTERFACE,

-			TIMING,

-			AVAILABILITY,

-			RELIABILITY,

-			CONFIDENTIALITY,

-			MAINTAINABILITY,

-		};

+	private static final QualityRequirementKind[] VALUES_ARRAY = new QualityRequirementKind[]{ ERGONOMY, CONFIGURABILITY, INTEGRITY, SAFETY, OTHER, SECURITY, HUMAN_MACHINE_INTERFACE, TIMING, AVAILABILITY, RELIABILITY, CONFIDENTIALITY, MAINTAINABILITY, };

 

 	/**

 	 * A public read-only list of all the '<em><b>Quality Requirement Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static final List<QualityRequirementKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -347,22 +347,35 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Quality Requirement Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static QualityRequirementKind get(int value) {

-		switch (value) {

-			case ERGONOMY_VALUE: return ERGONOMY;

-			case CONFIGURABILITY_VALUE: return CONFIGURABILITY;

-			case INTEGRITY_VALUE: return INTEGRITY;

-			case SAFETY_VALUE: return SAFETY;

-			case OTHER_VALUE: return OTHER;

-			case SECURITY_VALUE: return SECURITY;

-			case HUMAN_MACHINE_INTERFACE_VALUE: return HUMAN_MACHINE_INTERFACE;

-			case TIMING_VALUE: return TIMING;

-			case AVAILABILITY_VALUE: return AVAILABILITY;

-			case RELIABILITY_VALUE: return RELIABILITY;

-			case CONFIDENTIALITY_VALUE: return CONFIDENTIALITY;

-			case MAINTAINABILITY_VALUE: return MAINTAINABILITY;

+		switch(value) {

+		case ERGONOMY_VALUE:

+			return ERGONOMY;

+		case CONFIGURABILITY_VALUE:

+			return CONFIGURABILITY;

+		case INTEGRITY_VALUE:

+			return INTEGRITY;

+		case SAFETY_VALUE:

+			return SAFETY;

+		case OTHER_VALUE:

+			return OTHER;

+		case SECURITY_VALUE:

+			return SECURITY;

+		case HUMAN_MACHINE_INTERFACE_VALUE:

+			return HUMAN_MACHINE_INTERFACE;

+		case TIMING_VALUE:

+			return TIMING;

+		case AVAILABILITY_VALUE:

+			return AVAILABILITY;

+		case RELIABILITY_VALUE:

+			return RELIABILITY;

+		case CONFIDENTIALITY_VALUE:

+			return CONFIDENTIALITY;

+		case MAINTAINABILITY_VALUE:

+			return MAINTAINABILITY;

 		}

 		return null;

 	}

@@ -370,12 +383,13 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Quality Requirement Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static QualityRequirementKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			QualityRequirementKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

+			if(result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -389,9 +403,9 @@ public enum QualityRequirementKind implements Enumerator {
 	 * @generated

 	 */

 	public static QualityRequirementKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			QualityRequirementKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

+			if(result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -400,18 +414,21 @@ public enum QualityRequirementKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final int value;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String name;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String literal;

@@ -419,6 +436,7 @@ public enum QualityRequirementKind implements Enumerator {
 	/**

 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private QualityRequirementKind(int value, String name, String literal) {

@@ -429,26 +447,29 @@ public enum QualityRequirementKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getLiteral() {

-	  return literal;

+		return literal;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getName() {

-	  return name;

+		return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public int getValue() {

-	  return value;

+		return value;

 	}

 

 	/**

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RedefinableElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RedefinableElement.java
index 65ac90ba344..877fcc4b629 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RedefinableElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RedefinableElement.java
@@ -21,27 +21,28 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Redefinable Element</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRedefinableElement()

  * @model abstract="true"

  * @generated

  */

 public interface RedefinableElement extends EObject {

+

 	/**

 	 * Returns the value of the '<em><b>Base Redefinable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Redefinable Element</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Redefinable Element</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Redefinable Element</em>' reference.

 	 * @see #setBase_RedefinableElement(org.eclipse.uml2.uml.RedefinableElement)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRedefinableElement_Base_RedefinableElement()

@@ -51,10 +52,13 @@ public interface RedefinableElement extends EObject {
 	org.eclipse.uml2.uml.RedefinableElement getBase_RedefinableElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement

+	 * <em>Base Redefinable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Redefinable Element</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Redefinable Element</em>' reference.

 	 * @see #getBase_RedefinableElement()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Refine.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Refine.java
index 0c124b7d1b4..065af995d35 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Refine.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Refine.java
@@ -23,37 +23,41 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Refine</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Refine is a relationship metaclass, which signifies a dependency relationship in-between Requirements and EAElements, showing the relationship when a client EAElement refines the supplier Requirement.
+ * The Refine is a relationship metaclass, which signifies a dependency relationship in-between Requirements and EAElements, showing the relationship
+ * when a client EAElement refines the supplier Requirement.
  * 
  * Semantics:
- * The Refine metaclass signifies a refined requirement/refined by relationship between a Requirement and an EAElement, where the modification of the supplier Requirement may impact the refining client EAElement. The Refine metaclass implies the semantics that the refining client EAElement is not complete, without the supplier Requirement. 
+ * The Refine metaclass signifies a refined requirement/refined by relationship between a Requirement and an EAElement, where the modification of the
+ * supplier Requirement may impact the refining client EAElement. The Refine metaclass implies the semantics that the refining client EAElement is not
+ * complete, without the supplier Requirement.
  * 
  * Constraints:
  * [1] The property refinedBy must not have the types Requirement or RequirementContainer.
  * 
  * Notation:
- * A Refine relationship is shown as a dashed arrow between the Requirements and EAElement. The entity at the tail of the arrow (the refining EAElement) depends on the Requirement at the arrowhead (the refined Requirement).
+ * A Refine relationship is shown as a dashed arrow between the Requirements and EAElement. The entity at the tail of the arrow (the refining
+ * EAElement) depends on the Requirement at the arrowhead (the refined Requirement).
  * 
  * Extension: specializes UML2 stereotype Refine, which extends Dependency.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedRequirement <em>Refined Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy <em>Refined By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy_path <em>Refined By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedRequirement <em>Refined Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy <em>Refined By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy_path <em>Refined By path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRefine()
  * @model
  * @generated
  */
-public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.profile.l2.Refine {
+public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.profile.standard.Refine {
 
 	/**
 	 * Returns the value of the '<em><b>Refined By</b></em>' reference list.
@@ -64,6 +68,7 @@ public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.p
 	 * List of ADLEntity participating to the refinement of the refined ADL requirements.
 	 * {derived from UML::Dependency::client}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Refined By</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRefine_RefinedBy()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -75,10 +80,10 @@ public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.p
 	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Dependency</em>' reference.
 	 * @see #setBase_Dependency(Dependency)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRefine_Base_Dependency()
@@ -91,7 +96,9 @@ public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.p
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Dependency</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Dependency</em>' reference.
 	 * @see #getBase_Dependency()
 	 * @generated
 	 */
@@ -102,10 +109,10 @@ public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.p
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Refined By path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Refined By path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Refined By path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRefine_RefinedBy_path()
 	 * @model
@@ -122,6 +129,7 @@ public interface Refine extends RequirementsRelationship, org.eclipse.uml2.uml.p
 	 * List of refined requirements.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Refined Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRefine_RefinedRequirement()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Requirement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Requirement.java
index 21c704f3464..3657ab08b16 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Requirement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Requirement.java
@@ -24,11 +24,16 @@ import org.eclipse.papyrus.eastadl.behavior.Mode;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Requirement</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Requirement represents a capability or condition that must (or should) be satisfied. A Requirement can also specify an informal constraint, e.g. "The development of the component X must be according to the standard Y", or "The realization of this function as a software component must adhere to the scope and external interface as specified by this function". It will be used to unite the common properties of specific requirement types. A Requirement may either be directly associated to a Context (by inheriting from TraceableSpecification or it may be included in a RequirementContainer, which represents a larger unit or module of specification information.
+ * The Requirement represents a capability or condition that must (or should) be satisfied. A Requirement can also specify an informal constraint,
+ * e.g. "The development of the component X must be according to the standard Y", or
+ * "The realization of this function as a software component must adhere to the scope and external interface as specified by this function". It will
+ * be used to unite the common properties of specific requirement types. A Requirement may either be directly associated to a Context (by inheriting
+ * from TraceableSpecification or it may be included in a RequirementContainer, which represents a larger unit or module of specification information.
  * 
- * The traceability between Requirement entities, and other specification or design entities, will be ensured by the relationship dependencies described in the Infrastructure part of this specification.
+ * The traceability between Requirement entities, and other specification or design entities, will be ensured by the relationship dependencies
+ * described in the Infrastructure part of this specification.
  * 
  * Semantics:
  * The Requirement metaclass applies to the EAElement that is associated to the Requirement through the Satisfy relation.
@@ -44,21 +49,22 @@ import org.eclipse.papyrus.eastadl.behavior.Mode;
  * Extension:
  * To specialize SysML::Requirement, which extends Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getFormalism <em>Formalism</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getUrl <em>Url</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getFormalism <em>Formalism</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getMode <em>Mode</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirement()
  * @model
  * @generated
  */
 public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requirement, RequirementSpecificationObject {
+
 	/**
 	 * Returns the value of the '<em><b>Formalism</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -66,6 +72,7 @@ public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requ
 	 * <!-- begin-model-doc -->
 	 * Specifies the language used for the requirement statement.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Formalism</em>' attribute.
 	 * @see #setFormalism(String)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirement_Formalism()
@@ -79,10 +86,10 @@ public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requ
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.behavior.Mode}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirement_Mode()
 	 * @model ordered="false"
@@ -97,6 +104,7 @@ public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requ
 	 * <!-- begin-model-doc -->
 	 * Reference to possible external file containing the requirement statement.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Url</em>' attribute.
 	 * @see #setUrl(String)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirement_Url()
@@ -109,7 +117,9 @@ public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requ
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getFormalism <em>Formalism</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Formalism</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Formalism</em>' attribute.
 	 * @see #getFormalism()
 	 * @generated
 	 */
@@ -119,7 +129,9 @@ public interface Requirement extends org.eclipse.papyrus.sysml.requirements.Requ
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getUrl <em>Url</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Url</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Url</em>' attribute.
 	 * @see #getUrl()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementSpecificationObject.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementSpecificationObject.java
index 47959117978..2c04401f05c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementSpecificationObject.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementSpecificationObject.java
@@ -22,18 +22,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Requirement Specification Object</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * In general it is a standard practice (e.g. using IBM Rational DOORS) to define requirements and also rationales, explanations and other requirement related information as direct successors or predecessors of an appropriate requirement. Thus, requirements and requirement related information are generalized to RequirementSpecificationObject which in turn can be referenced by the structuring container structure (RequirementContainer).
+ * In general it is a standard practice (e.g. using IBM Rational DOORS) to define requirements and also rationales, explanations and other requirement
+ * related information as direct successors or predecessors of an appropriate requirement. Thus, requirements and requirement related information are
+ * generalized to RequirementSpecificationObject which in turn can be referenced by the structuring container structure (RequirementContainer).
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject#getReferencingContainer <em>Referencing Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject#getReferencingContainer <em>Referencing Container</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementSpecificationObject()
  * @model abstract="true"
  * @generated
@@ -45,10 +47,10 @@ public interface RequirementSpecificationObject extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Referencing Container</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Referencing Container</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Referencing Container</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementSpecificationObject_ReferencingContainer()
 	 * @model required="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsContainer.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsContainer.java
index 49e32b6f0cb..695dc8941a0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsContainer.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsContainer.java
@@ -23,51 +23,64 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Container</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * RequirementContainer represents a larger unit or module of specification information. It is used to share several Requirements which are semantically related to each other. Also, a RequirementContainer structure will be used for structuring requirement specification objects (Requirements, Rationals etc.). Thus, to preserve the ordering of requirement specification objects the ordering of child containers is very important here.
+ * RequirementContainer represents a larger unit or module of specification information. It is used to share several Requirements which are
+ * semantically related to each other. Also, a RequirementContainer structure will be used for structuring requirement specification objects
+ * (Requirements, Rationals etc.). Thus, to preserve the ordering of requirement specification objects the ordering of child containers is very
+ * important here.
  * 
- * In addition to sharing related Requirements, the RequirementContainer allows to define relations between its contained Requirements and also a grouping of them.
+ * In addition to sharing related Requirements, the RequirementContainer allows to define relations between its contained Requirements and also a
+ * grouping of them.
  * 
- * Furthermore, the RequirementContainer allows introducing additional user attribute definitions by way of UserAttributeElementTypes or UserAttributeTemplates which are valid only locally inside this RequirementContainer. These are additional in that they are used in addition to the user attribute definitions which are provided globally for the entire EAST-ADL2 repository.
+ * Furthermore, the RequirementContainer allows introducing additional user attribute definitions by way of UserAttributeElementTypes or
+ * UserAttributeTemplates which are valid only locally inside this RequirementContainer. These are additional in that they are used in addition to the
+ * user attribute definitions which are provided globally for the entire EAST-ADL2 repository.
  * 
- * An EAST-ADL2 system model may contain a forest of RequirementContainer (see parent child relationship). Only non root RequirementContainer which have a parentContainer are allowed to reference a RequirementSpecificationObject.
- * The RequirementContainer with its parent child containment relationship and the reference to RequirementSpecificationObject is the basis element for structuring requirement information into a forest structure.
+ * An EAST-ADL2 system model may contain a forest of RequirementContainer (see parent child relationship). Only non root RequirementContainer which
+ * have a parentContainer are allowed to reference a RequirementSpecificationObject.
+ * The RequirementContainer with its parent child containment relationship and the reference to RequirementSpecificationObject is the basis element
+ * for structuring requirement information into a forest structure.
  * 
  * Constraints:
- * [1] Only non root RequirementContainer (parentContainer must be set) which have a parentContainer are allowed to reference a RequirementSpecificationObject.
+ * [1] Only non root RequirementContainer (parentContainer must be set) which have a parentContainer are allowed to reference a
+ * RequirementSpecificationObject.
  * 
  * Notation:
  * RequirementContainer is shown as a solid-outline rectangle containing the name. Contained entities may also be shown inside (White-box view)
  * 
  * Extension: Package
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer <em>Child Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject <em>Contained Req Spec Object</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer <em>Child Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject <em>Contained Req Spec Object</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer()
  * @model
  * @generated
  */
 public interface RequirementsContainer extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Child Container</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer
+	 * <em>Parent Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * Sub containers of a requirement container. Sub containers may have references (each time max. 1) to requirement specification objects. To preserve the original ordering of requirement specifiaction objects, the ordering of Sub containers is very important here.
+	 * Sub containers of a requirement container. Sub containers may have references (each time max. 1) to requirement specification objects. To
+	 * preserve the original ordering of requirement specifiaction objects, the ordering of Sub containers is very important here.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Child Container</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer_ChildContainer()
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer
@@ -80,10 +93,10 @@ public interface RequirementsContainer extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Contained Req Spec Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Contained Req Spec Object</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Contained Req Spec Object</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Contained Req Spec Object</em>' reference.
 	 * @see #setContainedReqSpecObject(RequirementSpecificationObject)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer_ContainedReqSpecObject()
@@ -94,12 +107,15 @@ public interface RequirementsContainer extends TraceableSpecification {
 
 	/**
 	 * Returns the value of the '<em><b>Parent Container</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer <em>Child Container</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer
+	 * <em>Child Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The Parent container of a container. If there is no parent, the container is a root container and thus cannot have a reference to a requirement specification object.
+	 * The Parent container of a container. If there is no parent, the container is a root container and thus cannot have a reference to a requirement
+	 * specification object.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Parent Container</em>' reference.
 	 * @see #setParentContainer(RequirementsContainer)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer_ParentContainer()
@@ -110,20 +126,26 @@ public interface RequirementsContainer extends TraceableSpecification {
 	RequirementsContainer getParentContainer();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject <em>Contained Req Spec Object</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject
+	 * <em>Contained Req Spec Object</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contained Req Spec Object</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Contained Req Spec Object</em>' reference.
 	 * @see #getContainedReqSpecObject()
 	 * @generated
 	 */
 	void setContainedReqSpecObject(RequirementSpecificationObject value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Container</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Parent Container</em>' reference.
 	 * @see #getParentContainer()
 	 * @generated
 	 */
@@ -133,10 +155,10 @@ public interface RequirementsContainer extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer_Base_Class()
@@ -149,7 +171,9 @@ public interface RequirementsContainer extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -159,10 +183,10 @@ public interface RequirementsContainer extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsContainer_Base_Package()
@@ -175,7 +199,9 @@ public interface RequirementsContainer extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsFactory.java
index e74ccfdfd4b..7f07a8e2420 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface RequirementsFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	RequirementsFactory eINSTANCE = org.eclipse.papyrus.eastadl.requirements.impl.RequirementsFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Derive Requirement</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Derive Requirement</em>'.

 	 * @generated

 	 */

@@ -45,6 +48,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Operational Situation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Operational Situation</em>'.

 	 * @generated

 	 */

@@ -54,6 +58,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Actor</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Actor</em>'.

 	 * @generated

 	 */

@@ -63,6 +68,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Quality Requirement</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Quality Requirement</em>'.

 	 * @generated

 	 */

@@ -72,6 +78,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Refine</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Refine</em>'.

 	 * @generated

 	 */

@@ -81,6 +88,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Requirement</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Requirement</em>'.

 	 * @generated

 	 */

@@ -90,6 +98,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Container</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Container</em>'.

 	 * @generated

 	 */

@@ -99,6 +108,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Link</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Link</em>'.

 	 * @generated

 	 */

@@ -108,6 +118,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Model</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Model</em>'.

 	 * @generated

 	 */

@@ -117,6 +128,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Related Information</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Related Information</em>'.

 	 * @generated

 	 */

@@ -126,6 +138,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Relation Group</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Relation Group</em>'.

 	 * @generated

 	 */

@@ -135,6 +148,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Satisfy</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Satisfy</em>'.

 	 * @generated

 	 */

@@ -144,6 +158,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Use Case</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Use Case</em>'.

 	 * @generated

 	 */

@@ -153,6 +168,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Include</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Include</em>'.

 	 * @generated

 	 */

@@ -162,6 +178,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Extend</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Extend</em>'.

 	 * @generated

 	 */

@@ -171,6 +188,7 @@ public interface RequirementsFactory extends EFactory {
 	 * Returns a new object of class '<em>Extension Point</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Extension Point</em>'.

 	 * @generated

 	 */

@@ -179,6 +197,7 @@ public interface RequirementsFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsLink.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsLink.java
index 388ed3e90af..8a16a680650 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsLink.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsLink.java
@@ -22,44 +22,49 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Link</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * RequirementsLink represents a relation between two or more Requirements. Source and target Requirements of the relation are distinguished, which means that the relation is directed (from source to target). If such a distinction does not make sense, then use a RequirementsGroup instead.
+ * RequirementsLink represents a relation between two or more Requirements. Source and target Requirements of the relation are distinguished, which
+ * means that the relation is directed (from source to target). If such a distinction does not make sense, then use a RequirementsGroup instead.
  * 
- * The standard case will be a relation with one source and one target Requirement. However, it is possible to have several source and/or several target Requirements so that general relations can be expressed with instances of this metaclass.
+ * The standard case will be a relation with one source and one target Requirement. However, it is possible to have several source and/or several
+ * target Requirements so that general relations can be expressed with instances of this metaclass.
  * 
  * The semantic of a concrete Requirement relation can be provided by the modeler. In particular, three ways are conceivable:
  * 
- * (1) The user attributes of the relation can be used to specify its meaning, for example with a user attribute called "relationType" which is set to values such as "needs" or "excludes".
+ * (1) The user attributes of the relation can be used to specify its meaning, for example with a user attribute called "relationType" which is set to
+ * values such as "needs" or "excludes".
  * 
  * (2) The UserAttributeElementType can be used. Certain types will be used for certain relation semantics.
  * 
- * (3) RequirementsRelationGroups can be used, i.e. all relations with an "excludes" meaning are put in one relation group and all with a "needs" meaning are put in another.
+ * (3) RequirementsRelationGroups can be used, i.e. all relations with an "excludes" meaning are put in one relation group and all with a "needs"
+ * meaning are put in another.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional <em>Is Bidirectional</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional <em>Is Bidirectional</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsLink()
  * @model
  * @generated
  */
 public interface RequirementsLink extends RequirementsRelationship {
+
 	/**
 	 * Returns the value of the '<em><b>Source</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsLink_Source()
 	 * @model required="true" ordered="false"
@@ -72,10 +77,10 @@ public interface RequirementsLink extends RequirementsRelationship {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Requirement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsLink_Target()
 	 * @model required="true" ordered="false"
@@ -87,10 +92,10 @@ public interface RequirementsLink extends RequirementsRelationship {
 	 * Returns the value of the '<em><b>Is Bidirectional</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Is Bidirectional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Is Bidirectional</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Is Bidirectional</em>' attribute.
 	 * @see #setIsBidirectional(boolean)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsLink_IsBidirectional()
@@ -100,10 +105,13 @@ public interface RequirementsLink extends RequirementsRelationship {
 	boolean isIsBidirectional();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional <em>Is Bidirectional</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional <em>Is Bidirectional</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Bidirectional</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Bidirectional</em>' attribute.
 	 * @see #isIsBidirectional()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsModel.java
index 86e01fa026b..98a5aa13d59 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsModel.java
@@ -24,36 +24,37 @@ import org.eclipse.uml2.uml.UseCase;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Model</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The collection of requirements, their relationships, and usecases. This collection can be done across the EAST-ADL2 abstraction levels.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getUseCase <em>Use Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirement <em>Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirementContainer <em>Requirement Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getOperationalSituation <em>Operational Situation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getUseCase <em>Use Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirement <em>Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirementContainer <em>Requirement Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getOperationalSituation <em>Operational Situation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel()
  * @model
  * @generated
  */
 public interface RequirementsModel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Operational Situation</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Operational Situation</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Operational Situation</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Operational Situation</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel_OperationalSituation()
 	 * @model ordered="false"
@@ -65,10 +66,10 @@ public interface RequirementsModel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel_Base_Package()
@@ -81,7 +82,9 @@ public interface RequirementsModel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -92,10 +95,10 @@ public interface RequirementsModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Requirement</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Requirement</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel_Requirement()
 	 * @model ordered="false"
@@ -108,10 +111,11 @@ public interface RequirementsModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Requirement Container</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Requirement Container</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Requirement Container</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel_RequirementContainer()
 	 * @model ordered="false"
@@ -124,10 +128,10 @@ public interface RequirementsModel extends Context {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.UseCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Use Case</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Use Case</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Use Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsModel_UseCase()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsPackage.java
index 50c596540d7..5096824bce6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsPackage.java
@@ -81,13 +81,16 @@ public interface RequirementsPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl <em>Quality Requirement</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl <em>Quality Requirement</em>}'

+		 * class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getQualityRequirement()

 		 * @generated

@@ -97,14 +100,17 @@ public interface RequirementsPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Quality Requirement Type</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE = eINSTANCE.getQualityRequirement_QualityRequirementType();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl <em>Requirement Specification Object</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl

+		 * <em>Requirement Specification Object</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementSpecificationObject()

 		 * @generated

@@ -115,6 +121,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Referencing Container</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER = eINSTANCE.getRequirementSpecificationObject_ReferencingContainer();

@@ -123,6 +130,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl <em>Container</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsContainer()

 		 * @generated

@@ -133,6 +141,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Child Container</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_CONTAINER__CHILD_CONTAINER = eINSTANCE.getRequirementsContainer_ChildContainer();

@@ -141,6 +150,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Parent Container</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_CONTAINER__PARENT_CONTAINER = eINSTANCE.getRequirementsContainer_ParentContainer();

@@ -149,6 +159,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_CONTAINER__BASE_CLASS = eINSTANCE.getRequirementsContainer_Base_Class();

@@ -157,6 +168,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_CONTAINER__BASE_PACKAGE = eINSTANCE.getRequirementsContainer_Base_Package();

@@ -165,14 +177,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Contained Req Spec Object</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT = eINSTANCE.getRequirementsContainer_ContainedReqSpecObject();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl <em>Related Information</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl

+		 * <em>Related Information</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelatedInformation()

 		 * @generated

@@ -183,14 +198,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS = eINSTANCE.getRequirementsRelatedInformation_Base_Class();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl <em>Relationship</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl <em>Relationship</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelationship()

 		 * @generated

@@ -201,6 +219,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_RELATIONSHIP__BASE_CLASS = eINSTANCE.getRequirementsRelationship_Base_Class();

@@ -209,6 +228,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl <em>Satisfy</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getSatisfy()

 		 * @generated

@@ -219,6 +239,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Satisfied Requirement</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SATISFY__SATISFIED_REQUIREMENT = eINSTANCE.getSatisfy_SatisfiedRequirement();

@@ -227,6 +248,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Satisfied By</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SATISFY__SATISFIED_BY = eINSTANCE.getSatisfy_SatisfiedBy();

@@ -235,6 +257,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Satisfied Use Case</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SATISFY__SATISFIED_USE_CASE = eINSTANCE.getSatisfy_SatisfiedUseCase();

@@ -243,6 +266,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Satisfied By path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SATISFY__SATISFIED_BY_PATH = eINSTANCE.getSatisfy_SatisfiedBy_path();

@@ -251,6 +275,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl <em>Use Case</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getUseCase()

 		 * @generated

@@ -261,6 +286,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Use Case</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference USE_CASE__BASE_USE_CASE = eINSTANCE.getUseCase_Base_UseCase();

@@ -269,6 +295,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Include</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference USE_CASE__INCLUDE = eINSTANCE.getUseCase_Include();

@@ -277,6 +304,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Extend</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference USE_CASE__EXTEND = eINSTANCE.getUseCase_Extend();

@@ -285,6 +313,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Extension Point</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference USE_CASE__EXTENSION_POINT = eINSTANCE.getUseCase_ExtensionPoint();

@@ -293,6 +322,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl <em>Include</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getInclude()

 		 * @generated

@@ -303,6 +333,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Include</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference INCLUDE__BASE_INCLUDE = eINSTANCE.getInclude_Base_Include();

@@ -311,6 +342,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Addition</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference INCLUDE__ADDITION = eINSTANCE.getInclude_Addition();

@@ -319,6 +351,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl <em>Extend</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getExtend()

 		 * @generated

@@ -329,6 +362,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Extend</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference EXTEND__BASE_EXTEND = eINSTANCE.getExtend_Base_Extend();

@@ -337,6 +371,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Extended Case</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference EXTEND__EXTENDED_CASE = eINSTANCE.getExtend_ExtendedCase();

@@ -345,6 +380,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Extension Location</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference EXTEND__EXTENSION_LOCATION = eINSTANCE.getExtend_ExtensionLocation();

@@ -353,6 +389,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl <em>Extension Point</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getExtensionPoint()

 		 * @generated

@@ -363,14 +400,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Extension Point</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference EXTENSION_POINT__BASE_EXTENSION_POINT = eINSTANCE.getExtensionPoint_Base_ExtensionPoint();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl <em>Redefinable Element</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl <em>Redefinable Element</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRedefinableElement()

 		 * @generated

@@ -381,6 +421,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Redefinable Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT = eINSTANCE.getRedefinableElement_Base_RedefinableElement();

@@ -389,6 +430,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl <em>Refine</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRefine()

 		 * @generated

@@ -399,6 +441,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Refined Requirement</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REFINE__REFINED_REQUIREMENT = eINSTANCE.getRefine_RefinedRequirement();

@@ -407,6 +450,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Refined By</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REFINE__REFINED_BY = eINSTANCE.getRefine_RefinedBy();

@@ -415,6 +459,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REFINE__BASE_DEPENDENCY = eINSTANCE.getRefine_Base_Dependency();

@@ -423,14 +468,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Refined By path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REFINE__REFINED_BY_PATH = eINSTANCE.getRefine_RefinedBy_path();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl <em>Derive Requirement</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl <em>Derive Requirement</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getDeriveRequirement()

 		 * @generated

@@ -441,6 +489,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Derived</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference DERIVE_REQUIREMENT__DERIVED = eINSTANCE.getDeriveRequirement_Derived();

@@ -449,14 +498,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Derived From</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference DERIVE_REQUIREMENT__DERIVED_FROM = eINSTANCE.getDeriveRequirement_DerivedFrom();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl <em>Relation Group</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl

+		 * <em>Relation Group</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelationGroup()

 		 * @generated

@@ -467,6 +519,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Relation</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_RELATION_GROUP__RELATION = eINSTANCE.getRequirementsRelationGroup_Relation();

@@ -475,6 +528,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_RELATION_GROUP__BASE_CLASS = eINSTANCE.getRequirementsRelationGroup_Base_Class();

@@ -483,6 +537,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE = eINSTANCE.getRequirementsRelationGroup_Base_Package();

@@ -491,6 +546,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl <em>Link</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsLink()

 		 * @generated

@@ -501,6 +557,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Bidirectional</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute REQUIREMENTS_LINK__IS_BIDIRECTIONAL = eINSTANCE.getRequirementsLink_IsBidirectional();

@@ -509,6 +566,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_LINK__SOURCE = eINSTANCE.getRequirementsLink_Source();

@@ -517,6 +575,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_LINK__TARGET = eINSTANCE.getRequirementsLink_Target();

@@ -525,6 +584,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl <em>Model</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsModel()

 		 * @generated

@@ -535,6 +595,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Use Case</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_MODEL__USE_CASE = eINSTANCE.getRequirementsModel_UseCase();

@@ -543,6 +604,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Requirement</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_MODEL__REQUIREMENT = eINSTANCE.getRequirementsModel_Requirement();

@@ -551,6 +613,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Requirement Container</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER = eINSTANCE.getRequirementsModel_RequirementContainer();

@@ -559,6 +622,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Operational Situation</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_MODEL__OPERATIONAL_SITUATION = eINSTANCE.getRequirementsModel_OperationalSituation();

@@ -567,14 +631,17 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENTS_MODEL__BASE_PACKAGE = eINSTANCE.getRequirementsModel_Base_Package();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl <em>Operational Situation</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl

+		 * <em>Operational Situation</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getOperationalSituation()

 		 * @generated

@@ -585,6 +652,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference OPERATIONAL_SITUATION__BASE_CLASS = eINSTANCE.getOperationalSituation_Base_Class();

@@ -593,6 +661,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl <em>Actor</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getActor()

 		 * @generated

@@ -603,6 +672,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Actor</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ACTOR__BASE_ACTOR = eINSTANCE.getActor_Base_Actor();

@@ -611,6 +681,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl <em>Requirement</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirement()

 		 * @generated

@@ -621,6 +692,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Formalism</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute REQUIREMENT__FORMALISM = eINSTANCE.getRequirement_Formalism();

@@ -629,6 +701,7 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute REQUIREMENT__URL = eINSTANCE.getRequirement_Url();

@@ -637,13 +710,16 @@ public interface RequirementsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mode</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference REQUIREMENT__MODE = eINSTANCE.getRequirement_Mode();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind <em>Quality Requirement Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind <em>Quality Requirement Kind</em>}'

+		 * enum.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind

 		 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getQualityRequirementKind()

 		 * @generated

@@ -655,6 +731,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "requirements";

@@ -662,6 +739,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Requirements/1";

@@ -669,6 +747,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "Requirements";

@@ -676,6 +755,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	RequirementsPackage eINSTANCE = org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl.init();

@@ -684,6 +764,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl <em>Requirement</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirement()

 	 * @generated

@@ -694,6 +775,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Text</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -703,6 +785,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -712,6 +795,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -721,6 +805,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived From</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -730,6 +815,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -739,6 +825,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -748,6 +835,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Traced To</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -757,6 +845,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Verified By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -766,6 +855,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Master</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -775,6 +865,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -784,6 +875,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -793,6 +885,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -802,6 +895,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -811,6 +905,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -820,6 +915,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -829,6 +925,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Referencing Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -838,6 +935,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Formalism</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -847,6 +945,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Url</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -856,6 +955,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -865,6 +965,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Requirement</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -873,6 +974,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl <em>Quality Requirement</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getQualityRequirement()

 	 * @generated

@@ -883,6 +985,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Text</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -892,6 +995,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -901,6 +1005,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -910,6 +1015,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived From</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -919,6 +1025,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -928,6 +1035,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -937,6 +1045,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Traced To</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -946,6 +1055,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Verified By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -955,6 +1065,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Master</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -964,6 +1075,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -973,6 +1085,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -982,6 +1095,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1000,6 +1114,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1009,6 +1124,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1018,6 +1134,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Referencing Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1027,6 +1144,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Formalism</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1036,6 +1154,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Url</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1045,6 +1164,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1069,9 +1189,11 @@ public interface RequirementsPackage extends EPackage {
 	int QUALITY_REQUIREMENT_FEATURE_COUNT = REQUIREMENT_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl <em>Requirement Specification Object</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl

+	 * <em>Requirement Specification Object</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementSpecificationObject()

 	 * @generated

@@ -1082,6 +1204,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1091,6 +1214,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1100,6 +1224,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1109,6 +1234,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1118,6 +1244,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1127,6 +1254,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Referencing Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1136,6 +1264,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Requirement Specification Object</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1145,6 +1274,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl <em>Container</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsContainer()

 	 * @generated

@@ -1155,6 +1285,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1164,6 +1295,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1173,6 +1305,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1182,6 +1315,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1191,6 +1325,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1200,6 +1335,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1209,6 +1345,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent Container</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1218,6 +1355,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1227,6 +1365,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1236,6 +1375,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Contained Req Spec Object</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1245,15 +1385,18 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Container</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int REQUIREMENTS_CONTAINER_FEATURE_COUNT = ElementsPackage.TRACEABLE_SPECIFICATION_FEATURE_COUNT + 5;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl <em>Related Information</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl

+	 * <em>Related Information</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelatedInformation()

 	 * @generated

@@ -1264,6 +1407,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1273,6 +1417,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1282,6 +1427,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1291,6 +1437,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1300,6 +1447,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1309,6 +1457,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Referencing Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1318,6 +1467,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1327,6 +1477,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Related Information</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1336,6 +1487,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl <em>Relationship</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelationship()

 	 * @generated

@@ -1346,6 +1498,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1355,6 +1508,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1364,6 +1518,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1373,6 +1528,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1382,6 +1538,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Relationship</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1391,6 +1548,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl <em>Satisfy</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getSatisfy()

 	 * @generated

@@ -1401,6 +1559,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl <em>Refine</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRefine()

 	 * @generated

@@ -1411,6 +1570,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl <em>Derive Requirement</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getDeriveRequirement()

 	 * @generated

@@ -1421,6 +1581,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1430,6 +1591,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1439,6 +1601,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1448,6 +1611,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1457,6 +1621,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1466,6 +1631,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied Requirement</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1475,6 +1641,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1484,6 +1651,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied By path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1493,6 +1661,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Satisfied Use Case</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1502,6 +1671,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Satisfy</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1511,6 +1681,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl <em>Use Case</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getUseCase()

 	 * @generated

@@ -1521,6 +1692,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1530,6 +1702,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1539,6 +1712,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1548,6 +1722,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1557,6 +1732,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1566,6 +1742,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Use Case</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1575,6 +1752,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Include</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1584,6 +1762,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Extend</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1593,6 +1772,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Extension Point</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1602,6 +1782,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Use Case</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1611,6 +1792,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl <em>Include</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getInclude()

 	 * @generated

@@ -1621,6 +1803,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1630,6 +1813,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1639,6 +1823,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1648,6 +1833,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Include</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1657,6 +1843,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Addition</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1666,6 +1853,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Include</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1675,6 +1863,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl <em>Extend</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getExtend()

 	 * @generated

@@ -1685,6 +1874,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1694,6 +1884,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1703,6 +1894,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1712,6 +1904,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Extend</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1721,6 +1914,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Extended Case</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1730,6 +1924,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Extension Location</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1739,6 +1934,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Extend</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1748,6 +1944,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl <em>Redefinable Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRedefinableElement()

 	 * @generated

@@ -1758,6 +1955,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Redefinable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1767,6 +1965,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Redefinable Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1776,6 +1975,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl <em>Extension Point</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getExtensionPoint()

 	 * @generated

@@ -1786,6 +1986,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Redefinable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1795,6 +1996,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Extension Point</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1804,6 +2006,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Extension Point</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1813,6 +2016,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1822,6 +2026,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1831,6 +2036,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1840,6 +2046,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1849,6 +2056,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1858,6 +2066,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Refined Requirement</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1867,6 +2076,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1876,6 +2086,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1885,6 +2096,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Refined By path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1894,6 +2106,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Refine</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1903,6 +2116,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1912,6 +2126,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1921,6 +2136,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1930,6 +2146,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1939,6 +2156,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1948,6 +2166,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1957,6 +2176,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Derived From</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1966,6 +2186,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Derive Requirement</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1975,6 +2196,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl <em>Relation Group</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsRelationGroup()

 	 * @generated

@@ -1985,6 +2207,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1994,6 +2217,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2003,6 +2227,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2012,6 +2237,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2021,6 +2247,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2030,6 +2257,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Relation</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2039,6 +2267,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2048,6 +2277,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2057,6 +2287,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Relation Group</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2066,6 +2297,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl <em>Link</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsLink()

 	 * @generated

@@ -2076,6 +2308,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2085,6 +2318,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2094,6 +2328,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2103,6 +2338,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2112,6 +2348,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Bidirectional</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2121,6 +2358,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Source</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2130,6 +2368,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2139,6 +2378,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Link</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2148,6 +2388,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl <em>Model</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getRequirementsModel()

 	 * @generated

@@ -2158,6 +2399,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2167,6 +2409,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2176,6 +2419,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2185,6 +2429,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2194,6 +2439,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2203,6 +2449,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Use Case</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2212,6 +2459,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Requirement</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2221,6 +2469,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Requirement Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2230,6 +2479,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Operational Situation</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2239,6 +2489,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2248,15 +2499,18 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Model</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int REQUIREMENTS_MODEL_FEATURE_COUNT = ElementsPackage.CONTEXT_FEATURE_COUNT + 5;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl <em>Operational Situation</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl <em>Operational Situation</em>}'

+	 * class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getOperationalSituation()

 	 * @generated

@@ -2267,6 +2521,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2276,6 +2531,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2285,6 +2541,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2294,6 +2551,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2303,6 +2561,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2312,6 +2571,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2321,6 +2581,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Operational Situation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2330,6 +2591,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl <em>Actor</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getActor()

 	 * @generated

@@ -2340,6 +2602,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2349,6 +2612,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2358,6 +2622,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2367,6 +2632,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2376,6 +2642,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2385,6 +2652,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Actor</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2394,6 +2662,7 @@ public interface RequirementsPackage extends EPackage {
 	 * The number of structural features of the '<em>Actor</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2402,6 +2671,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind <em>Quality Requirement Kind</em>}' enum.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind

 	 * @see org.eclipse.papyrus.eastadl.requirements.impl.RequirementsPackageImpl#getQualityRequirementKind()

 	 * @generated

@@ -2412,6 +2682,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement <em>Derive Requirement</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Derive Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.DeriveRequirement

 	 * @generated

@@ -2419,9 +2690,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getDeriveRequirement();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerived <em>Derived</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerived <em>Derived</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Derived</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerived()

 	 * @see #getDeriveRequirement()

@@ -2430,9 +2703,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getDeriveRequirement_Derived();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerivedFrom <em>Derived From</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerivedFrom

+	 * <em>Derived From</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Derived From</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.DeriveRequirement#getDerivedFrom()

 	 * @see #getDeriveRequirement()

@@ -2444,6 +2719,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation <em>Operational Situation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Operational Situation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.OperationalSituation

 	 * @generated

@@ -2451,9 +2727,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getOperationalSituation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.OperationalSituation#getBase_Class()

 	 * @see #getOperationalSituation()

@@ -2465,6 +2743,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Actor <em>Actor</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Actor</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Actor

 	 * @generated

@@ -2475,6 +2754,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Actor#getBase_Actor <em>Base Actor</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Actor</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Actor#getBase_Actor()

 	 * @see #getActor()

@@ -2485,6 +2765,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement <em>Quality Requirement</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Quality Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirement

 	 * @generated

@@ -2492,8 +2773,10 @@ public interface RequirementsPackage extends EPackage {
 	EClass getQualityRequirement();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType <em>Quality Requirement Type</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType

+	 * <em>Quality Requirement Type</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Quality Requirement Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirement#getQualityRequirementType()

 	 * @see #getQualityRequirement()

@@ -2504,6 +2787,7 @@ public interface RequirementsPackage extends EPackage {
 	/**

 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind <em>Quality Requirement Kind</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Quality Requirement Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirementKind

 	 * @generated

@@ -2514,6 +2798,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Refine <em>Refine</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Refine</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine

 	 * @generated

@@ -2524,6 +2809,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy <em>Refined By</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Refined By</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy()

 	 * @see #getRefine()

@@ -2532,9 +2818,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRefine_RefinedBy();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency <em>Base Dependency</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency <em>Base Dependency</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Dependency</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine#getBase_Dependency()

 	 * @see #getRefine()

@@ -2543,9 +2831,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRefine_Base_Dependency();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy_path <em>Refined By path</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy_path

+	 * <em>Refined By path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Refined By path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedBy_path()

 	 * @see #getRefine()

@@ -2554,9 +2844,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRefine_RefinedBy_path();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedRequirement <em>Refined Requirement</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedRequirement

+	 * <em>Refined Requirement</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Refined Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine#getRefinedRequirement()

 	 * @see #getRefine()

@@ -2568,6 +2860,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Requirement <em>Requirement</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Requirement

 	 * @generated

@@ -2578,6 +2871,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getFormalism <em>Formalism</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Formalism</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Requirement#getFormalism()

 	 * @see #getRequirement()

@@ -2589,6 +2883,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getMode <em>Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Mode</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Requirement#getMode()

 	 * @see #getRequirement()

@@ -2600,6 +2895,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.Requirement#getUrl <em>Url</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Url</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Requirement#getUrl()

 	 * @see #getRequirement()

@@ -2611,6 +2907,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer <em>Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer

 	 * @generated

@@ -2618,9 +2915,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsContainer();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer <em>Child Container</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer

+	 * <em>Child Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Child Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getChildContainer()

 	 * @see #getRequirementsContainer()

@@ -2629,9 +2928,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsContainer_ChildContainer();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject <em>Contained Req Spec Object</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject

+	 * <em>Contained Req Spec Object</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Contained Req Spec Object</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getContainedReqSpecObject()

 	 * @see #getRequirementsContainer()

@@ -2640,9 +2941,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsContainer_ContainedReqSpecObject();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer <em>Parent Container</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer

+	 * <em>Parent Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Parent Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getParentContainer()

 	 * @see #getRequirementsContainer()

@@ -2651,9 +2954,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsContainer_ParentContainer();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Class()

 	 * @see #getRequirementsContainer()

@@ -2662,9 +2967,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsContainer_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer#getBase_Package()

 	 * @see #getRequirementsContainer()

@@ -2676,6 +2983,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -2685,6 +2993,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink <em>Link</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Link</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsLink

 	 * @generated

@@ -2692,9 +3001,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsLink();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional <em>Is Bidirectional</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional

+	 * <em>Is Bidirectional</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Bidirectional</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsLink#isIsBidirectional()

 	 * @see #getRequirementsLink()

@@ -2706,6 +3017,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getSource <em>Source</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Source</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getSource()

 	 * @see #getRequirementsLink()

@@ -2717,6 +3029,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getTarget <em>Target</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Target</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsLink#getTarget()

 	 * @see #getRequirementsLink()

@@ -2728,6 +3041,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel <em>Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel

 	 * @generated

@@ -2735,9 +3049,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsModel();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getOperationalSituation <em>Operational Situation</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getOperationalSituation

+	 * <em>Operational Situation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Operational Situation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getOperationalSituation()

 	 * @see #getRequirementsModel()

@@ -2746,9 +3062,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsModel_OperationalSituation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getBase_Package()

 	 * @see #getRequirementsModel()

@@ -2757,9 +3075,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsModel_Base_Package();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirement <em>Requirement</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirement

+	 * <em>Requirement</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirement()

 	 * @see #getRequirementsModel()

@@ -2768,9 +3088,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsModel_Requirement();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirementContainer <em>Requirement Container</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirementContainer

+	 * <em>Requirement Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Requirement Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getRequirementContainer()

 	 * @see #getRequirementsModel()

@@ -2779,9 +3101,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsModel_RequirementContainer();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getUseCase <em>Use Case</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getUseCase <em>Use Case</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Use Case</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel#getUseCase()

 	 * @see #getRequirementsModel()

@@ -2790,9 +3114,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsModel_UseCase();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject <em>Requirement Specification Object</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject

+	 * <em>Requirement Specification Object</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Requirement Specification Object</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject

 	 * @generated

@@ -2800,9 +3126,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementSpecificationObject();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject#getReferencingContainer <em>Referencing Container</em>}'.

+	 * Returns the meta object for the reference list '

+	 * {@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject#getReferencingContainer <em>Referencing Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Referencing Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject#getReferencingContainer()

 	 * @see #getRequirementSpecificationObject()

@@ -2811,9 +3139,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementSpecificationObject_ReferencingContainer();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation <em>Related Information</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation <em>Related Information</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Related Information</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation

 	 * @generated

@@ -2821,9 +3151,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsRelatedInformation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class()

 	 * @see #getRequirementsRelatedInformation()

@@ -2835,6 +3167,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup <em>Relation Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Relation Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup

 	 * @generated

@@ -2842,9 +3175,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsRelationGroup();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getRelation <em>Relation</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getRelation

+	 * <em>Relation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Relation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getRelation()

 	 * @see #getRequirementsRelationGroup()

@@ -2853,9 +3188,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsRelationGroup_Relation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class()

 	 * @see #getRequirementsRelationGroup()

@@ -2864,9 +3201,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRequirementsRelationGroup_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package()

 	 * @see #getRequirementsRelationGroup()

@@ -2878,6 +3217,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship <em>Relationship</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Relationship</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship

 	 * @generated

@@ -2885,9 +3225,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRequirementsRelationship();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class()

 	 * @see #getRequirementsRelationship()

@@ -2899,6 +3241,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy <em>Satisfy</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Satisfy</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy

 	 * @generated

@@ -2909,6 +3252,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy <em>Satisfied By</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Satisfied By</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy()

 	 * @see #getSatisfy()

@@ -2917,9 +3261,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getSatisfy_SatisfiedBy();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy_path <em>Satisfied By path</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy_path

+	 * <em>Satisfied By path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Satisfied By path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy_path()

 	 * @see #getSatisfy()

@@ -2931,6 +3277,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.UseCase <em>Use Case</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Use Case</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase

 	 * @generated

@@ -2941,6 +3288,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getBase_UseCase <em>Base Use Case</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Use Case</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase#getBase_UseCase()

 	 * @see #getUseCase()

@@ -2949,9 +3297,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getUseCase_Base_UseCase();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getInclude <em>Include</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getInclude

+	 * <em>Include</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the containment reference list '<em>Include</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase#getInclude()

 	 * @see #getUseCase()

@@ -2960,9 +3310,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getUseCase_Include();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtend <em>Extend</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtend <em>Extend</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the containment reference list '<em>Extend</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase#getExtend()

 	 * @see #getUseCase()

@@ -2971,9 +3323,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getUseCase_Extend();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtensionPoint <em>Extension Point</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtensionPoint

+	 * <em>Extension Point</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the containment reference list '<em>Extension Point</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase#getExtensionPoint()

 	 * @see #getUseCase()

@@ -2985,6 +3339,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Include <em>Include</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Include</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Include

 	 * @generated

@@ -2995,6 +3350,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Include#getBase_Include <em>Base Include</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Include</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Include#getBase_Include()

 	 * @see #getInclude()

@@ -3006,6 +3362,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Include#getAddition <em>Addition</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Addition</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Include#getAddition()

 	 * @see #getInclude()

@@ -3017,6 +3374,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.Extend <em>Extend</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Extend</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Extend

 	 * @generated

@@ -3027,6 +3385,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getBase_Extend <em>Base Extend</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Extend</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Extend#getBase_Extend()

 	 * @see #getExtend()

@@ -3038,6 +3397,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtendedCase <em>Extended Case</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Extended Case</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Extend#getExtendedCase()

 	 * @see #getExtend()

@@ -3046,9 +3406,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getExtend_ExtendedCase();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtensionLocation <em>Extension Location</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Extend#getExtensionLocation

+	 * <em>Extension Location</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Extension Location</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Extend#getExtensionLocation()

 	 * @see #getExtend()

@@ -3060,6 +3422,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint <em>Extension Point</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Extension Point</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.ExtensionPoint

 	 * @generated

@@ -3067,9 +3430,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getExtensionPoint();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint <em>Base Extension Point</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint

+	 * <em>Base Extension Point</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Extension Point</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.ExtensionPoint#getBase_ExtensionPoint()

 	 * @see #getExtensionPoint()

@@ -3081,6 +3446,7 @@ public interface RequirementsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement <em>Redefinable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Redefinable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RedefinableElement

 	 * @generated

@@ -3088,9 +3454,11 @@ public interface RequirementsPackage extends EPackage {
 	EClass getRedefinableElement();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement

+	 * <em>Base Redefinable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Redefinable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RedefinableElement#getBase_RedefinableElement()

 	 * @see #getRedefinableElement()

@@ -3099,9 +3467,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getRedefinableElement_Base_RedefinableElement();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedRequirement <em>Satisfied Requirement</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedRequirement

+	 * <em>Satisfied Requirement</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Satisfied Requirement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedRequirement()

 	 * @see #getSatisfy()

@@ -3110,9 +3480,11 @@ public interface RequirementsPackage extends EPackage {
 	EReference getSatisfy_SatisfiedRequirement();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedUseCase <em>Satisfied Use Case</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedUseCase

+	 * <em>Satisfied Use Case</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Satisfied Use Case</em>'.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedUseCase()

 	 * @see #getSatisfy()

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelatedInformation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelatedInformation.java
index 306aaa94bae..9b442161db3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelatedInformation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelatedInformation.java
@@ -20,34 +20,38 @@ package org.eclipse.papyrus.eastadl.requirements;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Related Information</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * This is a placeholder for all objects which are not Requirements (such as Rational, Explanations, Related Material etc...). E.g. an element of type RequirementsRelatedInformation which is a rational of an element of type Requirement will directly succeeding this requirement as a sibling element (see structuring of requirement elements via RequirementContainer).
+ * This is a placeholder for all objects which are not Requirements (such as Rational, Explanations, Related Material etc...). E.g. an element of type
+ * RequirementsRelatedInformation which is a rational of an element of type Requirement will directly succeeding this requirement as a sibling element
+ * (see structuring of requirement elements via RequirementContainer).
  * 
  * Semantics:
- * This metaclass can be used to represents information this is not a requirement but is related to requirements and is often provided together with a set of requirements in a requirements specification.
+ * This metaclass can be used to represents information this is not a requirement but is related to requirements and is often provided together with a
+ * set of requirements in a requirements specification.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelatedInformation()
  * @model
  * @generated
  */
 public interface RequirementsRelatedInformation extends RequirementSpecificationObject {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelatedInformation_Base_Class()
@@ -57,10 +61,13 @@ public interface RequirementsRelatedInformation extends RequirementSpecification
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationGroup.java
index a2001fcbcc3..e8ce31417e3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationGroup.java
@@ -23,33 +23,36 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Relation Group</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * RequirementsRelationGroup represents a group of relations between Requirements.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getRelation <em>Relation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationGroup()
  * @model
  * @generated
  */
 public interface RequirementsRelationGroup extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Relation</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.RequirementsLink}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The relations that are grouped by this relation group. Note that this is not a containment association, i.e. a single relation may be grouped by several ReqRelationGroups.
+	 * The relations that are grouped by this relation group. Note that this is not a containment association, i.e. a single relation may be grouped
+	 * by several ReqRelationGroups.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Relation</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationGroup_Relation()
 	 * @model ordered="false"
@@ -61,10 +64,10 @@ public interface RequirementsRelationGroup extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationGroup_Base_Class()
@@ -77,7 +80,9 @@ public interface RequirementsRelationGroup extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -87,10 +92,10 @@ public interface RequirementsRelationGroup extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationGroup_Base_Package()
@@ -100,10 +105,13 @@ public interface RequirementsRelationGroup extends TraceableSpecification {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationship.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationship.java
index 426d3909f7f..d6e0bf8183a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationship.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/RequirementsRelationship.java
@@ -21,36 +21,42 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Relationship</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * A relation between two or more requirements.  Source and target requirements of the relation are distinguished, which means that the relation is directed (from source to target).  If such a distinction does not make sense, then use a ReqGroup instead.
- * The standard case will be a relation with one source and one target requirement.  However, it is possible to have several source and-or several target requirements so that general n:m relations can be expressed with instances of this class.
- * The semantic of a concrete requirement relation is not defined by the EAST-ADL2 and therefore needs to be provided by the modeler.  In particular, three ways are conceivable:
- * 1) The user attributes of the relation can be used to specify its meaning, for example with a user attribute called relationType which is set to values such as needs or excludes.
- * 2) The uaType (user attributeable element type) can be used.  Certain types will be used for certain relation semantics.
- * 3) ReqRelationGroups can be used, i.e. all relations with an excludes meaning are put in one relation group and all with a needs meaning are put in another
+ * A relation between two or more requirements. Source and target requirements of the relation are distinguished, which means that the relation is
+ * directed (from source to target). If such a distinction does not make sense, then use a ReqGroup instead.
+ * The standard case will be a relation with one source and one target requirement. However, it is possible to have several source and-or several
+ * target requirements so that general n:m relations can be expressed with instances of this class.
+ * The semantic of a concrete requirement relation is not defined by the EAST-ADL2 and therefore needs to be provided by the modeler. In particular,
+ * three ways are conceivable:
+ * 1) The user attributes of the relation can be used to specify its meaning, for example with a user attribute called relationType which is set to
+ * values such as needs or excludes.
+ * 2) The uaType (user attributeable element type) can be used. Certain types will be used for certain relation semantics.
+ * 3) ReqRelationGroups can be used, i.e. all relations with an excludes meaning are put in one relation group and all with a needs meaning are put in
+ * another
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationship()
  * @model abstract="true"
  * @generated
  */
 public interface RequirementsRelationship extends Relationship {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getRequirementsRelationship_Base_Class()
@@ -63,7 +69,9 @@ public interface RequirementsRelationship extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Satisfy.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Satisfy.java
index 1372c416b6c..6fde58b2252 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Satisfy.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/Satisfy.java
@@ -22,39 +22,45 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Satisfy</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The Satisfy is a relationship metaclass, which signifies relationship between Requirements and an element intended to satisfy the Requirement.
  * 
  * Semantics:
- * The Satisfy metaclass signifies a satisfied requirement/satisfied by relationship between a set of Requirements and a set of satisfying entities, where the modification of the supplier Requirements may impact the satisfying client entities. The Satisfy metaclass implies the semantics that the satisfying client entities are not complete, without the supplier Requirement.
+ * The Satisfy metaclass signifies a satisfied requirement/satisfied by relationship between a set of Requirements and a set of satisfying entities,
+ * where the modification of the supplier Requirements may impact the satisfying client entities. The Satisfy metaclass implies the semantics that the
+ * satisfying client entities are not complete, without the supplier Requirement.
  * 
  * Constraints:
  * [1] The EAElement in the association satisfiedBy may not be a Requirement or RequirementContainer.
- * [2] An element of type Satisfy is only allowed to have associations to either elements of type UseCase (see satisfiedUseCase) or elements of type Requirement (see satisfiedRequirement). Not both at the same time!
+ * [2] An element of type Satisfy is only allowed to have associations to either elements of type UseCase (see satisfiedUseCase) or elements of type
+ * Requirement (see satisfiedRequirement). Not both at the same time!
  * 
  * Notation:
- * A Satisfy relationship is shown as a dashed line with a arrowhead at the end that corresponds to the satisfied Requirement or UseCaseUseCase. The entity at the tail of the arrow (the satisfying EAElement or the satisfying ARElement) depends on the entity at the arrowhead (the satisfied Requirement or UseCaseUseCase).
+ * A Satisfy relationship is shown as a dashed line with a arrowhead at the end that corresponds to the satisfied Requirement or UseCaseUseCase. The
+ * entity at the tail of the arrow (the satisfying EAElement or the satisfying ARElement) depends on the entity at the arrowhead (the satisfied
+ * Requirement or UseCaseUseCase).
  * 
  * Extension:
  * To specialize SysML::Satisfy, which extends Realization.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedRequirement <em>Satisfied Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy <em>Satisfied By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy_path <em>Satisfied By path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedUseCase <em>Satisfied Use Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedRequirement <em>Satisfied Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy <em>Satisfied By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedBy_path <em>Satisfied By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.Satisfy#getSatisfiedUseCase <em>Satisfied Use Case</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getSatisfy()
  * @model
  * @generated
  */
 public interface Satisfy extends RequirementsRelationship, org.eclipse.papyrus.sysml.requirements.Satisfy {
+
 	/**
 	 * Returns the value of the '<em><b>Satisfied By</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
@@ -64,6 +70,7 @@ public interface Satisfy extends RequirementsRelationship, org.eclipse.papyrus.s
 	 * List of satisfied ADL use cases, which are satisfied by the client ADL entities or satisfied by the client AUTOSAR elements.
 	 * {derived from UML::Dependency::client}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Satisfied By</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getSatisfy_SatisfiedBy()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -76,10 +83,10 @@ public interface Satisfy extends RequirementsRelationship, org.eclipse.papyrus.s
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Satisfied By path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Satisfied By path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Satisfied By path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getSatisfy_SatisfiedBy_path()
 	 * @model
@@ -96,6 +103,7 @@ public interface Satisfy extends RequirementsRelationship, org.eclipse.papyrus.s
 	 * List of satisfied ADL requirements, which are satisfied by the client ADL entities.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Satisfied Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getSatisfy_SatisfiedRequirement()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -108,15 +116,15 @@ public interface Satisfy extends RequirementsRelationship, org.eclipse.papyrus.s
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.UseCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Satisfied Use Case</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Satisfied Use Case</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Satisfied Use Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getSatisfy_SatisfiedUseCase()
 	 * @model ordered="false"
 	 * @generated
 	 */
-	EList<org.eclipse.papyrus.eastadl.requirements.UseCase> getSatisfiedUseCase();
+	EList<UseCase> getSatisfiedUseCase();
 
 } // Satisfy
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/UseCase.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/UseCase.java
index 2cb1a4c8fd7..00639bcbebc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/UseCase.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/UseCase.java
@@ -22,30 +22,31 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Use Case</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getBase_UseCase <em>Base Use Case</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getInclude <em>Include</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtend <em>Extend</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtensionPoint <em>Extension Point</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getBase_UseCase <em>Base Use Case</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getInclude <em>Include</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtend <em>Extend</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getExtensionPoint <em>Extension Point</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getUseCase()

  * @model

  * @generated

  */

 public interface UseCase extends TraceableSpecification {

+

 	/**

 	 * Returns the value of the '<em><b>Base Use Case</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Use Case</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Use Case</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Use Case</em>' reference.

 	 * @see #setBase_UseCase(org.eclipse.uml2.uml.UseCase)

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getUseCase_Base_UseCase()

@@ -58,7 +59,9 @@ public interface UseCase extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.UseCase#getBase_UseCase <em>Base Use Case</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Use Case</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Use Case</em>' reference.

 	 * @see #getBase_UseCase()

 	 * @generated

 	 */

@@ -69,10 +72,10 @@ public interface UseCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Include}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Include</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Include</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Include</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getUseCase_Include()

 	 * @model containment="true" ordered="false"

@@ -85,10 +88,10 @@ public interface UseCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.Extend}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Extend</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Extend</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Extend</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getUseCase_Extend()

 	 * @model containment="true" ordered="false"

@@ -101,10 +104,10 @@ public interface UseCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.ExtensionPoint}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Extension Point</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Extension Point</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Extension Point</em>' containment reference list.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#getUseCase_ExtensionPoint()

 	 * @model containment="true" ordered="false"

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ActorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ActorImpl.java
index d71695b71b3..29d7b8914a6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ActorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ActorImpl.java
@@ -30,25 +30,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl#getBase_Actor <em>Base Actor</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ActorImpl#getBase_Actor <em>Base Actor</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class ActorImpl extends TraceableSpecificationImpl implements Actor {

+

 	/**

 	 * The cached value of the '{@link #getBase_Actor() <em>Base Actor</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Actor()

 	 * @generated

 	 * @ordered

 	 */

 	protected org.eclipse.uml2.uml.Actor base_Actor;

+

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ActorImpl() {

@@ -58,6 +62,7 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,14 +73,15 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Actor getBase_Actor() {

-		if (base_Actor != null && base_Actor.eIsProxy()) {

+		if(base_Actor != null && base_Actor.eIsProxy()) {

 			InternalEObject oldBase_Actor = (InternalEObject)base_Actor;

 			base_Actor = (org.eclipse.uml2.uml.Actor)eResolveProxy(oldBase_Actor);

-			if (base_Actor != oldBase_Actor) {

-				if (eNotificationRequired())

+			if(base_Actor != oldBase_Actor) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.ACTOR__BASE_ACTOR, oldBase_Actor, base_Actor));

 			}

 		}

@@ -85,6 +91,7 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Actor basicGetBase_Actor() {

@@ -94,26 +101,29 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Actor(org.eclipse.uml2.uml.Actor newBase_Actor) {

 		org.eclipse.uml2.uml.Actor oldBase_Actor = base_Actor;

 		base_Actor = newBase_Actor;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.ACTOR__BASE_ACTOR, oldBase_Actor, base_Actor));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.ACTOR__BASE_ACTOR:

-				if (resolve) return getBase_Actor();

-				return basicGetBase_Actor();

+		switch(featureID) {

+		case RequirementsPackage.ACTOR__BASE_ACTOR:

+			if(resolve)

+				return getBase_Actor();

+			return basicGetBase_Actor();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,14 +131,15 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.ACTOR__BASE_ACTOR:

-				setBase_Actor((org.eclipse.uml2.uml.Actor)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.ACTOR__BASE_ACTOR:

+			setBase_Actor((org.eclipse.uml2.uml.Actor)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,14 +147,15 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.ACTOR__BASE_ACTOR:

-				setBase_Actor((org.eclipse.uml2.uml.Actor)null);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.ACTOR__BASE_ACTOR:

+			setBase_Actor((org.eclipse.uml2.uml.Actor)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -151,13 +163,14 @@ public class ActorImpl extends TraceableSpecificationImpl implements Actor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.ACTOR__BASE_ACTOR:

-				return base_Actor != null;

+		switch(featureID) {

+		case RequirementsPackage.ACTOR__BASE_ACTOR:

+			return base_Actor != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/DeriveRequirementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/DeriveRequirementImpl.java
index 5bfcb239b99..234939f7245 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/DeriveRequirementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/DeriveRequirementImpl.java
@@ -30,8 +30,7 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
 import org.eclipse.papyrus.sysml.requirements.DeriveReqt;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.profile.l2.L2Package;
-import org.eclipse.uml2.uml.profile.l2.Trace;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 
@@ -40,12 +39,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getDerived <em>Derived</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getDerivedFrom <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getDerived <em>Derived</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.DeriveRequirementImpl#getDerivedFrom <em>Derived From</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DeriveRequirementImpl extends RequirementsRelationshipImpl implements DeriveRequirement {
@@ -53,6 +52,7 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 	/**
 	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Abstraction()
 	 * @generated
 	 * @ordered
@@ -61,6 +61,7 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DeriveRequirementImpl() {
@@ -69,6 +70,7 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction basicGetBase_Abstraction() {
@@ -77,19 +79,23 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION: return L2Package.TRACE__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
+				return StandardPackage.TRACE__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == DeriveReqt.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
+		if(baseClass == DeriveReqt.class) {
+			switch(derivedFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -97,19 +103,23 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (baseFeatureID) {
-				case L2Package.TRACE__BASE_ABSTRACTION: return RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(baseFeatureID) {
+			case StandardPackage.TRACE__BASE_ABSTRACTION:
+				return RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == DeriveReqt.class) {
-			switch (baseFeatureID) {
-				default: return -1;
+		if(baseClass == DeriveReqt.class) {
+			switch(baseFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -117,55 +127,60 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
-				if (resolve) return getBase_Abstraction();
-				return basicGetBase_Abstraction();
-			case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED:
-				return getDerived();
-			case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED_FROM:
-				return getDerivedFrom();
+		switch(featureID) {
+		case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
+			if(resolve)
+				return getBase_Abstraction();
+			return basicGetBase_Abstraction();
+		case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED:
+			return getDerived();
+		case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED_FROM:
+			return getDerivedFrom();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
-				return base_Abstraction != null;
-			case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED:
-				return !getDerived().isEmpty();
-			case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED_FROM:
-				return !getDerivedFrom().isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
+			return base_Abstraction != null;
+		case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED:
+			return !getDerived().isEmpty();
+		case RequirementsPackage.DERIVE_REQUIREMENT__DERIVED_FROM:
+			return !getDerivedFrom().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -175,28 +190,30 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction getBase_Abstraction() {
-		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {
+		if(base_Abstraction != null && base_Abstraction.eIsProxy()) {
 			InternalEObject oldBase_Abstraction = (InternalEObject)base_Abstraction;
 			base_Abstraction = (Abstraction)eResolveProxy(oldBase_Abstraction);
-			if (base_Abstraction != oldBase_Abstraction) {
-				if (eNotificationRequired())
+			if(base_Abstraction != oldBase_Abstraction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 			}
 		}
@@ -263,12 +280,13 @@ public class DeriveRequirementImpl extends RequirementsRelationshipImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Abstraction(Abstraction newBase_Abstraction) {
 		Abstraction oldBase_Abstraction = base_Abstraction;
 		base_Abstraction = newBase_Abstraction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.DERIVE_REQUIREMENT__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtendImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtendImpl.java
index 6b947836601..51d80894336 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtendImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtendImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.requirements.UseCase;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getBase_Extend <em>Base Extend</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getExtendedCase <em>Extended Case</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getExtensionLocation <em>Extension Location</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getBase_Extend <em>Base Extend</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getExtendedCase <em>Extended Case</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtendImpl#getExtensionLocation <em>Extension Location</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class ExtendImpl extends RelationshipImpl implements Extend {

+

 	/**

 	 * The cached value of the '{@link #getBase_Extend() <em>Base Extend</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Extend()

 	 * @generated

 	 * @ordered

@@ -59,6 +61,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	 * The cached value of the '{@link #getExtendedCase() <em>Extended Case</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getExtendedCase()

 	 * @generated

 	 * @ordered

@@ -69,6 +72,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	 * The cached value of the '{@link #getExtensionLocation() <em>Extension Location</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getExtensionLocation()

 	 * @generated

 	 * @ordered

@@ -78,6 +82,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ExtendImpl() {

@@ -87,6 +92,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -97,14 +103,15 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Extend getBase_Extend() {

-		if (base_Extend != null && base_Extend.eIsProxy()) {

+		if(base_Extend != null && base_Extend.eIsProxy()) {

 			InternalEObject oldBase_Extend = (InternalEObject)base_Extend;

 			base_Extend = (org.eclipse.uml2.uml.Extend)eResolveProxy(oldBase_Extend);

-			if (base_Extend != oldBase_Extend) {

-				if (eNotificationRequired())

+			if(base_Extend != oldBase_Extend) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.EXTEND__BASE_EXTEND, oldBase_Extend, base_Extend));

 			}

 		}

@@ -114,6 +121,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Extend basicGetBase_Extend() {

@@ -123,26 +131,28 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Extend(org.eclipse.uml2.uml.Extend newBase_Extend) {

 		org.eclipse.uml2.uml.Extend oldBase_Extend = base_Extend;

 		base_Extend = newBase_Extend;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.EXTEND__BASE_EXTEND, oldBase_Extend, base_Extend));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UseCase getExtendedCase() {

-		if (extendedCase != null && extendedCase.eIsProxy()) {

+		if(extendedCase != null && extendedCase.eIsProxy()) {

 			InternalEObject oldExtendedCase = (InternalEObject)extendedCase;

 			extendedCase = (UseCase)eResolveProxy(oldExtendedCase);

-			if (extendedCase != oldExtendedCase) {

-				if (eNotificationRequired())

+			if(extendedCase != oldExtendedCase) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.EXTEND__EXTENDED_CASE, oldExtendedCase, extendedCase));

 			}

 		}

@@ -152,6 +162,7 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UseCase basicGetExtendedCase() {

@@ -161,22 +172,24 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setExtendedCase(UseCase newExtendedCase) {

 		UseCase oldExtendedCase = extendedCase;

 		extendedCase = newExtendedCase;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.EXTEND__EXTENDED_CASE, oldExtendedCase, extendedCase));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<ExtensionPoint> getExtensionLocation() {

-		if (extensionLocation == null) {

+		if(extensionLocation == null) {

 			extensionLocation = new EObjectResolvingEList<ExtensionPoint>(ExtensionPoint.class, this, RequirementsPackage.EXTEND__EXTENSION_LOCATION);

 		}

 		return extensionLocation;

@@ -185,19 +198,22 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.EXTEND__BASE_EXTEND:

-				if (resolve) return getBase_Extend();

-				return basicGetBase_Extend();

-			case RequirementsPackage.EXTEND__EXTENDED_CASE:

-				if (resolve) return getExtendedCase();

-				return basicGetExtendedCase();

-			case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

-				return getExtensionLocation();

+		switch(featureID) {

+		case RequirementsPackage.EXTEND__BASE_EXTEND:

+			if(resolve)

+				return getBase_Extend();

+			return basicGetBase_Extend();

+		case RequirementsPackage.EXTEND__EXTENDED_CASE:

+			if(resolve)

+				return getExtendedCase();

+			return basicGetExtendedCase();

+		case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

+			return getExtensionLocation();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -205,22 +221,23 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.EXTEND__BASE_EXTEND:

-				setBase_Extend((org.eclipse.uml2.uml.Extend)newValue);

-				return;

-			case RequirementsPackage.EXTEND__EXTENDED_CASE:

-				setExtendedCase((UseCase)newValue);

-				return;

-			case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

-				getExtensionLocation().clear();

-				getExtensionLocation().addAll((Collection<? extends ExtensionPoint>)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.EXTEND__BASE_EXTEND:

+			setBase_Extend((org.eclipse.uml2.uml.Extend)newValue);

+			return;

+		case RequirementsPackage.EXTEND__EXTENDED_CASE:

+			setExtendedCase((UseCase)newValue);

+			return;

+		case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

+			getExtensionLocation().clear();

+			getExtensionLocation().addAll((Collection<? extends ExtensionPoint>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -228,20 +245,21 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.EXTEND__BASE_EXTEND:

-				setBase_Extend((org.eclipse.uml2.uml.Extend)null);

-				return;

-			case RequirementsPackage.EXTEND__EXTENDED_CASE:

-				setExtendedCase((UseCase)null);

-				return;

-			case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

-				getExtensionLocation().clear();

-				return;

+		switch(featureID) {

+		case RequirementsPackage.EXTEND__BASE_EXTEND:

+			setBase_Extend((org.eclipse.uml2.uml.Extend)null);

+			return;

+		case RequirementsPackage.EXTEND__EXTENDED_CASE:

+			setExtendedCase((UseCase)null);

+			return;

+		case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

+			getExtensionLocation().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -249,17 +267,18 @@ public class ExtendImpl extends RelationshipImpl implements Extend {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.EXTEND__BASE_EXTEND:

-				return base_Extend != null;

-			case RequirementsPackage.EXTEND__EXTENDED_CASE:

-				return extendedCase != null;

-			case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

-				return extensionLocation != null && !extensionLocation.isEmpty();

+		switch(featureID) {

+		case RequirementsPackage.EXTEND__BASE_EXTEND:

+			return base_Extend != null;

+		case RequirementsPackage.EXTEND__EXTENDED_CASE:

+			return extendedCase != null;

+		case RequirementsPackage.EXTEND__EXTENSION_LOCATION:

+			return extensionLocation != null && !extensionLocation.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtensionPointImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtensionPointImpl.java
index 2658a76586f..190f3736559 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtensionPointImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/ExtensionPointImpl.java
@@ -29,25 +29,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl#getBase_ExtensionPoint <em>Base Extension Point</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.ExtensionPointImpl#getBase_ExtensionPoint <em>Base Extension Point</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class ExtensionPointImpl extends RedefinableElementImpl implements ExtensionPoint {

+

 	/**

 	 * The cached value of the '{@link #getBase_ExtensionPoint() <em>Base Extension Point</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_ExtensionPoint()

 	 * @generated

 	 * @ordered

 	 */

 	protected org.eclipse.uml2.uml.ExtensionPoint base_ExtensionPoint;

+

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ExtensionPointImpl() {

@@ -57,6 +61,7 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,14 +72,15 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.ExtensionPoint getBase_ExtensionPoint() {

-		if (base_ExtensionPoint != null && base_ExtensionPoint.eIsProxy()) {

+		if(base_ExtensionPoint != null && base_ExtensionPoint.eIsProxy()) {

 			InternalEObject oldBase_ExtensionPoint = (InternalEObject)base_ExtensionPoint;

 			base_ExtensionPoint = (org.eclipse.uml2.uml.ExtensionPoint)eResolveProxy(oldBase_ExtensionPoint);

-			if (base_ExtensionPoint != oldBase_ExtensionPoint) {

-				if (eNotificationRequired())

+			if(base_ExtensionPoint != oldBase_ExtensionPoint) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT, oldBase_ExtensionPoint, base_ExtensionPoint));

 			}

 		}

@@ -84,6 +90,7 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.ExtensionPoint basicGetBase_ExtensionPoint() {

@@ -93,26 +100,29 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_ExtensionPoint(org.eclipse.uml2.uml.ExtensionPoint newBase_ExtensionPoint) {

 		org.eclipse.uml2.uml.ExtensionPoint oldBase_ExtensionPoint = base_ExtensionPoint;

 		base_ExtensionPoint = newBase_ExtensionPoint;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT, oldBase_ExtensionPoint, base_ExtensionPoint));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

-				if (resolve) return getBase_ExtensionPoint();

-				return basicGetBase_ExtensionPoint();

+		switch(featureID) {

+		case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

+			if(resolve)

+				return getBase_ExtensionPoint();

+			return basicGetBase_ExtensionPoint();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,14 +130,15 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

-				setBase_ExtensionPoint((org.eclipse.uml2.uml.ExtensionPoint)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

+			setBase_ExtensionPoint((org.eclipse.uml2.uml.ExtensionPoint)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -135,14 +146,15 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

-				setBase_ExtensionPoint((org.eclipse.uml2.uml.ExtensionPoint)null);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

+			setBase_ExtensionPoint((org.eclipse.uml2.uml.ExtensionPoint)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -150,13 +162,14 @@ public class ExtensionPointImpl extends RedefinableElementImpl implements Extens
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

-				return base_ExtensionPoint != null;

+		switch(featureID) {

+		case RequirementsPackage.EXTENSION_POINT__BASE_EXTENSION_POINT:

+			return base_ExtensionPoint != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/IncludeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/IncludeImpl.java
index 811fc9f5c3a..6f8ca5e9006 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/IncludeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/IncludeImpl.java
@@ -31,18 +31,20 @@ import org.eclipse.papyrus.eastadl.requirements.UseCase;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl#getBase_Include <em>Base Include</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl#getAddition <em>Addition</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl#getBase_Include <em>Base Include</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.IncludeImpl#getAddition <em>Addition</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class IncludeImpl extends RelationshipImpl implements Include {

+

 	/**

 	 * The cached value of the '{@link #getBase_Include() <em>Base Include</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Include()

 	 * @generated

 	 * @ordered

@@ -53,6 +55,7 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	 * The cached value of the '{@link #getAddition() <em>Addition</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getAddition()

 	 * @generated

 	 * @ordered

@@ -62,6 +65,7 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IncludeImpl() {

@@ -71,6 +75,7 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -81,14 +86,15 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Include getBase_Include() {

-		if (base_Include != null && base_Include.eIsProxy()) {

+		if(base_Include != null && base_Include.eIsProxy()) {

 			InternalEObject oldBase_Include = (InternalEObject)base_Include;

 			base_Include = (org.eclipse.uml2.uml.Include)eResolveProxy(oldBase_Include);

-			if (base_Include != oldBase_Include) {

-				if (eNotificationRequired())

+			if(base_Include != oldBase_Include) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.INCLUDE__BASE_INCLUDE, oldBase_Include, base_Include));

 			}

 		}

@@ -98,6 +104,7 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Include basicGetBase_Include() {

@@ -107,26 +114,28 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Include(org.eclipse.uml2.uml.Include newBase_Include) {

 		org.eclipse.uml2.uml.Include oldBase_Include = base_Include;

 		base_Include = newBase_Include;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.INCLUDE__BASE_INCLUDE, oldBase_Include, base_Include));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UseCase getAddition() {

-		if (addition != null && addition.eIsProxy()) {

+		if(addition != null && addition.eIsProxy()) {

 			InternalEObject oldAddition = (InternalEObject)addition;

 			addition = (UseCase)eResolveProxy(oldAddition);

-			if (addition != oldAddition) {

-				if (eNotificationRequired())

+			if(addition != oldAddition) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.INCLUDE__ADDITION, oldAddition, addition));

 			}

 		}

@@ -136,6 +145,7 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UseCase basicGetAddition() {

@@ -145,29 +155,33 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAddition(UseCase newAddition) {

 		UseCase oldAddition = addition;

 		addition = newAddition;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.INCLUDE__ADDITION, oldAddition, addition));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.INCLUDE__BASE_INCLUDE:

-				if (resolve) return getBase_Include();

-				return basicGetBase_Include();

-			case RequirementsPackage.INCLUDE__ADDITION:

-				if (resolve) return getAddition();

-				return basicGetAddition();

+		switch(featureID) {

+		case RequirementsPackage.INCLUDE__BASE_INCLUDE:

+			if(resolve)

+				return getBase_Include();

+			return basicGetBase_Include();

+		case RequirementsPackage.INCLUDE__ADDITION:

+			if(resolve)

+				return getAddition();

+			return basicGetAddition();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -175,17 +189,18 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.INCLUDE__BASE_INCLUDE:

-				setBase_Include((org.eclipse.uml2.uml.Include)newValue);

-				return;

-			case RequirementsPackage.INCLUDE__ADDITION:

-				setAddition((UseCase)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.INCLUDE__BASE_INCLUDE:

+			setBase_Include((org.eclipse.uml2.uml.Include)newValue);

+			return;

+		case RequirementsPackage.INCLUDE__ADDITION:

+			setAddition((UseCase)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -193,17 +208,18 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.INCLUDE__BASE_INCLUDE:

-				setBase_Include((org.eclipse.uml2.uml.Include)null);

-				return;

-			case RequirementsPackage.INCLUDE__ADDITION:

-				setAddition((UseCase)null);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.INCLUDE__BASE_INCLUDE:

+			setBase_Include((org.eclipse.uml2.uml.Include)null);

+			return;

+		case RequirementsPackage.INCLUDE__ADDITION:

+			setAddition((UseCase)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -211,15 +227,16 @@ public class IncludeImpl extends RelationshipImpl implements Include {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.INCLUDE__BASE_INCLUDE:

-				return base_Include != null;

-			case RequirementsPackage.INCLUDE__ADDITION:

-				return addition != null;

+		switch(featureID) {

+		case RequirementsPackage.INCLUDE__BASE_INCLUDE:

+			return base_Include != null;

+		case RequirementsPackage.INCLUDE__ADDITION:

+			return addition != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/OperationalSituationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/OperationalSituationImpl.java
index f54e109e2b1..20001283316 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/OperationalSituationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/OperationalSituationImpl.java
@@ -31,25 +31,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.OperationalSituationImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OperationalSituationImpl extends TraceableSpecificationImpl implements OperationalSituation {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
 	 */
 	protected org.eclipse.uml2.uml.Class base_Class;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected OperationalSituationImpl() {
@@ -59,14 +63,16 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -74,13 +80,14 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -88,14 +95,15 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -103,6 +111,7 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,14 +122,15 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -130,6 +140,7 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -139,26 +150,28 @@ public class OperationalSituationImpl extends TraceableSpecificationImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.OPERATIONAL_SITUATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/QualityRequirementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/QualityRequirementImpl.java
index 20e6c67b0ac..5877b392ddc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/QualityRequirementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/QualityRequirementImpl.java
@@ -24,15 +24,14 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Quality Requirement</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Quality Requirement</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl#getQualityRequirementType <em>Quality Requirement Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.QualityRequirementImpl#getQualityRequirementType <em>Quality Requirement Type</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class QualityRequirementImpl extends RequirementImpl implements QualityRequirement {

@@ -40,6 +39,7 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 	/**

 	 * The default value of the '{@link #getQualityRequirementType() <em>Quality Requirement Type</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getQualityRequirementType()

 	 * @generated

 	 * @ordered

@@ -49,6 +49,7 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 	/**

 	 * The cached value of the '{@link #getQualityRequirementType() <em>Quality Requirement Type</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getQualityRequirementType()

 	 * @generated

 	 * @ordered

@@ -57,6 +58,7 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected QualityRequirementImpl() {

@@ -65,46 +67,50 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

-				return getQualityRequirementType();

+		switch(featureID) {

+		case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

+			return getQualityRequirementType();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

-				return qualityRequirementType != QUALITY_REQUIREMENT_TYPE_EDEFAULT;

+		switch(featureID) {

+		case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

+			return qualityRequirementType != QUALITY_REQUIREMENT_TYPE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

-				setQualityRequirementType((QualityRequirementKind)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

+			setQualityRequirementType((QualityRequirementKind)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -114,20 +120,22 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

-				setQualityRequirementType(QUALITY_REQUIREMENT_TYPE_EDEFAULT);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE:

+			setQualityRequirementType(QUALITY_REQUIREMENT_TYPE_EDEFAULT);

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public QualityRequirementKind getQualityRequirementType() {

@@ -136,22 +144,25 @@ public class QualityRequirementImpl extends RequirementImpl implements QualityRe
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setQualityRequirementType(QualityRequirementKind newQualityRequirementType) {

 		QualityRequirementKind oldQualityRequirementType = qualityRequirementType;

 		qualityRequirementType = newQualityRequirementType == null ? QUALITY_REQUIREMENT_TYPE_EDEFAULT : newQualityRequirementType;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.QUALITY_REQUIREMENT__QUALITY_REQUIREMENT_TYPE, oldQualityRequirementType, qualityRequirementType));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (qualityRequirementType: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RedefinableElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RedefinableElementImpl.java
index ddc1a795262..0c478662600 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RedefinableElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RedefinableElementImpl.java
@@ -30,25 +30,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RedefinableElementImpl#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public abstract class RedefinableElementImpl extends EObjectImpl implements RedefinableElement {

+

 	/**

 	 * The cached value of the '{@link #getBase_RedefinableElement() <em>Base Redefinable Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_RedefinableElement()

 	 * @generated

 	 * @ordered

 	 */

 	protected org.eclipse.uml2.uml.RedefinableElement base_RedefinableElement;

+

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected RedefinableElementImpl() {

@@ -58,6 +62,7 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,14 +73,15 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.RedefinableElement getBase_RedefinableElement() {

-		if (base_RedefinableElement != null && base_RedefinableElement.eIsProxy()) {

+		if(base_RedefinableElement != null && base_RedefinableElement.eIsProxy()) {

 			InternalEObject oldBase_RedefinableElement = (InternalEObject)base_RedefinableElement;

 			base_RedefinableElement = (org.eclipse.uml2.uml.RedefinableElement)eResolveProxy(oldBase_RedefinableElement);

-			if (base_RedefinableElement != oldBase_RedefinableElement) {

-				if (eNotificationRequired())

+			if(base_RedefinableElement != oldBase_RedefinableElement) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));

 			}

 		}

@@ -85,6 +91,7 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.RedefinableElement basicGetBase_RedefinableElement() {

@@ -94,26 +101,29 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_RedefinableElement(org.eclipse.uml2.uml.RedefinableElement newBase_RedefinableElement) {

 		org.eclipse.uml2.uml.RedefinableElement oldBase_RedefinableElement = base_RedefinableElement;

 		base_RedefinableElement = newBase_RedefinableElement;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

-				if (resolve) return getBase_RedefinableElement();

-				return basicGetBase_RedefinableElement();

+		switch(featureID) {

+		case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			if(resolve)

+				return getBase_RedefinableElement();

+			return basicGetBase_RedefinableElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,14 +131,15 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

-				setBase_RedefinableElement((org.eclipse.uml2.uml.RedefinableElement)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			setBase_RedefinableElement((org.eclipse.uml2.uml.RedefinableElement)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,14 +147,15 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

-				setBase_RedefinableElement((org.eclipse.uml2.uml.RedefinableElement)null);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			setBase_RedefinableElement((org.eclipse.uml2.uml.RedefinableElement)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -151,13 +163,14 @@ public abstract class RedefinableElementImpl extends EObjectImpl implements Rede
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

-				return base_RedefinableElement != null;

+		switch(featureID) {

+		case RequirementsPackage.REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:

+			return base_RedefinableElement != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RefineImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RefineImpl.java
index 8ff5b73e5a1..0f71df01a36 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RefineImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RefineImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Dependency;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.profile.l2.L2Package;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 
@@ -43,14 +43,14 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedRequirement <em>Refined Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedBy <em>Refined By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedBy_path <em>Refined By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedRequirement <em>Refined Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedBy <em>Refined By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RefineImpl#getRefinedBy_path <em>Refined By path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
@@ -59,6 +59,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Abstraction()
 	 * @generated
 	 * @ordered
@@ -69,6 +70,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Dependency()
 	 * @generated
 	 * @ordered
@@ -79,6 +81,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	 * The cached value of the '{@link #getRefinedBy_path() <em>Refined By path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRefinedBy_path()
 	 * @generated
 	 * @ordered
@@ -87,6 +90,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RefineImpl() {
@@ -96,6 +100,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction basicGetBase_Abstraction() {
@@ -105,14 +110,17 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == org.eclipse.uml2.uml.profile.l2.Refine.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.REFINE__BASE_ABSTRACTION: return L2Package.REFINE__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Refine.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.REFINE__BASE_ABSTRACTION:
+				return StandardPackage.REFINE__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -121,14 +129,17 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == org.eclipse.uml2.uml.profile.l2.Refine.class) {
-			switch (baseFeatureID) {
-				case L2Package.REFINE__BASE_ABSTRACTION: return RequirementsPackage.REFINE__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Refine.class) {
+			switch(baseFeatureID) {
+			case StandardPackage.REFINE__BASE_ABSTRACTION:
+				return RequirementsPackage.REFINE__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -136,72 +147,78 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REFINE__BASE_ABSTRACTION:
-				if (resolve) return getBase_Abstraction();
-				return basicGetBase_Abstraction();
-			case RequirementsPackage.REFINE__REFINED_REQUIREMENT:
-				return getRefinedRequirement();
-			case RequirementsPackage.REFINE__REFINED_BY:
-				return getRefinedBy();
-			case RequirementsPackage.REFINE__BASE_DEPENDENCY:
-				if (resolve) return getBase_Dependency();
-				return basicGetBase_Dependency();
-			case RequirementsPackage.REFINE__REFINED_BY_PATH:
-				return getRefinedBy_path();
+		switch(featureID) {
+		case RequirementsPackage.REFINE__BASE_ABSTRACTION:
+			if(resolve)
+				return getBase_Abstraction();
+			return basicGetBase_Abstraction();
+		case RequirementsPackage.REFINE__REFINED_REQUIREMENT:
+			return getRefinedRequirement();
+		case RequirementsPackage.REFINE__REFINED_BY:
+			return getRefinedBy();
+		case RequirementsPackage.REFINE__BASE_DEPENDENCY:
+			if(resolve)
+				return getBase_Dependency();
+			return basicGetBase_Dependency();
+		case RequirementsPackage.REFINE__REFINED_BY_PATH:
+			return getRefinedBy_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REFINE__BASE_ABSTRACTION:
-				return base_Abstraction != null;
-			case RequirementsPackage.REFINE__REFINED_REQUIREMENT:
-				return !getRefinedRequirement().isEmpty();
-			case RequirementsPackage.REFINE__REFINED_BY:
-				return !getRefinedBy().isEmpty();
-			case RequirementsPackage.REFINE__BASE_DEPENDENCY:
-				return base_Dependency != null;
-			case RequirementsPackage.REFINE__REFINED_BY_PATH:
-				return refinedBy_path != null && !refinedBy_path.isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.REFINE__BASE_ABSTRACTION:
+			return base_Abstraction != null;
+		case RequirementsPackage.REFINE__REFINED_REQUIREMENT:
+			return !getRefinedRequirement().isEmpty();
+		case RequirementsPackage.REFINE__REFINED_BY:
+			return !getRefinedBy().isEmpty();
+		case RequirementsPackage.REFINE__BASE_DEPENDENCY:
+			return base_Dependency != null;
+		case RequirementsPackage.REFINE__REFINED_BY_PATH:
+			return refinedBy_path != null && !refinedBy_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REFINE__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)newValue);
-				return;
-			case RequirementsPackage.REFINE__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)newValue);
-				return;
-			case RequirementsPackage.REFINE__REFINED_BY_PATH:
-				getRefinedBy_path().clear();
-				getRefinedBy_path().addAll((Collection<? extends NamedElement>)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REFINE__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)newValue);
+			return;
+		case RequirementsPackage.REFINE__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)newValue);
+			return;
+		case RequirementsPackage.REFINE__REFINED_BY_PATH:
+			getRefinedBy_path().clear();
+			getRefinedBy_path().addAll((Collection<? extends NamedElement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -211,20 +228,21 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REFINE__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)null);
-				return;
-			case RequirementsPackage.REFINE__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)null);
-				return;
-			case RequirementsPackage.REFINE__REFINED_BY_PATH:
-				getRefinedBy_path().clear();
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REFINE__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)null);
+			return;
+		case RequirementsPackage.REFINE__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)null);
+			return;
+		case RequirementsPackage.REFINE__REFINED_BY_PATH:
+			getRefinedBy_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -232,14 +250,15 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction getBase_Abstraction() {
-		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {
+		if(base_Abstraction != null && base_Abstraction.eIsProxy()) {
 			InternalEObject oldBase_Abstraction = (InternalEObject)base_Abstraction;
 			base_Abstraction = (Abstraction)eResolveProxy(oldBase_Abstraction);
-			if (base_Abstraction != oldBase_Abstraction) {
-				if (eNotificationRequired())
+			if(base_Abstraction != oldBase_Abstraction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REFINE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 			}
 		}
@@ -270,14 +289,15 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency getBase_Dependency() {
-		if (base_Dependency != null && base_Dependency.eIsProxy()) {
+		if(base_Dependency != null && base_Dependency.eIsProxy()) {
 			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;
 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);
-			if (base_Dependency != oldBase_Dependency) {
-				if (eNotificationRequired())
+			if(base_Dependency != oldBase_Dependency) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REFINE__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 			}
 		}
@@ -287,6 +307,7 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency basicGetBase_Dependency() {
@@ -296,22 +317,24 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Dependency(Dependency newBase_Dependency) {
 		Dependency oldBase_Dependency = base_Dependency;
 		base_Dependency = newBase_Dependency;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REFINE__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getRefinedBy_path() {
-		if (refinedBy_path == null) {
+		if(refinedBy_path == null) {
 			refinedBy_path = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, RequirementsPackage.REFINE__REFINED_BY_PATH);
 		}
 		return refinedBy_path;
@@ -348,12 +371,13 @@ public class RefineImpl extends RequirementsRelationshipImpl implements Refine {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Abstraction(Abstraction newBase_Abstraction) {
 		Abstraction oldBase_Abstraction = base_Abstraction;
 		base_Abstraction = newBase_Abstraction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REFINE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementImpl.java
index 8d15d9d6192..17f63f7b4c6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementImpl.java
@@ -52,27 +52,27 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getOwnedComment <em>Owned Comment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getBase_PackageableElement <em>Base Packageable Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getNote <em>Note</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getReferencingContainer <em>Referencing Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getFormalism <em>Formalism</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getUrl <em>Url</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getOwnedComment <em>Owned Comment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getBase_PackageableElement <em>Base Packageable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getNote <em>Note</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getReferencingContainer <em>Referencing Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getFormalism <em>Formalism</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementImpl#getMode <em>Mode</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl implements
-	Requirement {
+public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl implements Requirement {
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -83,6 +83,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 * @ordered
@@ -92,6 +93,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * The cached value of the '{@link #getOwnedComment() <em>Owned Comment</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedComment()
 	 * @generated
 	 * @ordered
@@ -102,6 +104,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The cached value of the '{@link #getBase_PackageableElement() <em>Base Packageable Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_PackageableElement()
 	 * @generated
 	 * @ordered
@@ -112,6 +115,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The default value of the '{@link #getNote() <em>Note</em>}' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getNote()
 	 * @generated
 	 * @ordered
@@ -122,6 +126,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The cached value of the '{@link #getNote() <em>Note</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNote()
 	 * @generated
 	 * @ordered
@@ -132,6 +137,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The cached value of the '{@link #getReferencingContainer() <em>Referencing Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReferencingContainer()
 	 * @generated
 	 * @ordered
@@ -162,6 +168,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUrl()
 	 * @generated
 	 * @ordered
@@ -172,6 +179,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUrl()
 	 * @generated
 	 * @ordered
@@ -190,6 +198,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementImpl() {
@@ -233,34 +242,45 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == EAElement.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.REQUIREMENT__NAME: return ElementsPackage.EA_ELEMENT__NAME;
-				case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT: return ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT;
-				case RequirementsPackage.REQUIREMENT__OWNED_COMMENT: return ElementsPackage.EA_ELEMENT__OWNED_COMMENT;
-				default: return -1;
+		if(baseClass == EAElement.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.REQUIREMENT__NAME:
+				return ElementsPackage.EA_ELEMENT__NAME;
+			case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
+				return ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT;
+			case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
+				return ElementsPackage.EA_ELEMENT__OWNED_COMMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == EAPackageableElement.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT: return ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT;
-				default: return -1;
+		if(baseClass == EAPackageableElement.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
+				return ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == TraceableSpecification.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.REQUIREMENT__NOTE: return ElementsPackage.TRACEABLE_SPECIFICATION__NOTE;
-				default: return -1;
+		if(baseClass == TraceableSpecification.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.REQUIREMENT__NOTE:
+				return ElementsPackage.TRACEABLE_SPECIFICATION__NOTE;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == RequirementSpecificationObject.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER: return RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER;
-				default: return -1;
+		if(baseClass == RequirementSpecificationObject.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
+				return RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -268,34 +288,45 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == EAElement.class) {
-			switch (baseFeatureID) {
-				case ElementsPackage.EA_ELEMENT__NAME: return RequirementsPackage.REQUIREMENT__NAME;
-				case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT: return RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT;
-				case ElementsPackage.EA_ELEMENT__OWNED_COMMENT: return RequirementsPackage.REQUIREMENT__OWNED_COMMENT;
-				default: return -1;
+		if(baseClass == EAElement.class) {
+			switch(baseFeatureID) {
+			case ElementsPackage.EA_ELEMENT__NAME:
+				return RequirementsPackage.REQUIREMENT__NAME;
+			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+				return RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT;
+			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+				return RequirementsPackage.REQUIREMENT__OWNED_COMMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == EAPackageableElement.class) {
-			switch (baseFeatureID) {
-				case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT: return RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT;
-				default: return -1;
+		if(baseClass == EAPackageableElement.class) {
+			switch(baseFeatureID) {
+			case ElementsPackage.EA_PACKAGEABLE_ELEMENT__BASE_PACKAGEABLE_ELEMENT:
+				return RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == TraceableSpecification.class) {
-			switch (baseFeatureID) {
-				case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE: return RequirementsPackage.REQUIREMENT__NOTE;
-				default: return -1;
+		if(baseClass == TraceableSpecification.class) {
+			switch(baseFeatureID) {
+			case ElementsPackage.TRACEABLE_SPECIFICATION__NOTE:
+				return RequirementsPackage.REQUIREMENT__NOTE;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == RequirementSpecificationObject.class) {
-			switch (baseFeatureID) {
-				case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER: return RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER;
-				default: return -1;
+		if(baseClass == RequirementSpecificationObject.class) {
+			switch(baseFeatureID) {
+			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
+				return RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -303,108 +334,114 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT__NAME:
-				return getName();
-			case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
-				if (resolve) return getBase_NamedElement();
-				return basicGetBase_NamedElement();
-			case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
-				return getOwnedComment();
-			case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
-				if (resolve) return getBase_PackageableElement();
-				return basicGetBase_PackageableElement();
-			case RequirementsPackage.REQUIREMENT__NOTE:
-				return getNote();
-			case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
-				return getReferencingContainer();
-			case RequirementsPackage.REQUIREMENT__FORMALISM:
-				return getFormalism();
-			case RequirementsPackage.REQUIREMENT__URL:
-				return getUrl();
-			case RequirementsPackage.REQUIREMENT__MODE:
-				return getMode();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT__NAME:
+			return getName();
+		case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
+			if(resolve)
+				return getBase_NamedElement();
+			return basicGetBase_NamedElement();
+		case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
+			return getOwnedComment();
+		case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
+			if(resolve)
+				return getBase_PackageableElement();
+			return basicGetBase_PackageableElement();
+		case RequirementsPackage.REQUIREMENT__NOTE:
+			return getNote();
+		case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
+			return getReferencingContainer();
+		case RequirementsPackage.REQUIREMENT__FORMALISM:
+			return getFormalism();
+		case RequirementsPackage.REQUIREMENT__URL:
+			return getUrl();
+		case RequirementsPackage.REQUIREMENT__MODE:
+			return getMode();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT__NAME:
-				return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
-			case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
-				return base_NamedElement != null;
-			case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
-				return ownedComment != null && !ownedComment.isEmpty();
-			case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
-				return base_PackageableElement != null;
-			case RequirementsPackage.REQUIREMENT__NOTE:
-				return NOTE_EDEFAULT == null ? note != null : !NOTE_EDEFAULT.equals(note);
-			case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
-				return referencingContainer != null && !referencingContainer.isEmpty();
-			case RequirementsPackage.REQUIREMENT__FORMALISM:
-				return FORMALISM_EDEFAULT == null ? formalism != null : !FORMALISM_EDEFAULT.equals(formalism);
-			case RequirementsPackage.REQUIREMENT__URL:
-				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
-			case RequirementsPackage.REQUIREMENT__MODE:
-				return mode != null && !mode.isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT__NAME:
+			return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
+		case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
+			return base_NamedElement != null;
+		case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
+			return ownedComment != null && !ownedComment.isEmpty();
+		case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
+			return base_PackageableElement != null;
+		case RequirementsPackage.REQUIREMENT__NOTE:
+			return NOTE_EDEFAULT == null ? note != null : !NOTE_EDEFAULT.equals(note);
+		case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
+			return referencingContainer != null && !referencingContainer.isEmpty();
+		case RequirementsPackage.REQUIREMENT__FORMALISM:
+			return FORMALISM_EDEFAULT == null ? formalism != null : !FORMALISM_EDEFAULT.equals(formalism);
+		case RequirementsPackage.REQUIREMENT__URL:
+			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		case RequirementsPackage.REQUIREMENT__MODE:
+			return mode != null && !mode.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT__NAME:
-				setName((String)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				getOwnedComment().addAll((Collection<? extends Comment>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
-				setBase_PackageableElement((PackageableElement)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__NOTE:
-				setNote((String)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
-				getReferencingContainer().clear();
-				getReferencingContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__FORMALISM:
-				setFormalism((String)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__URL:
-				setUrl((String)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENT__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT__NAME:
+			setName((String)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			getOwnedComment().addAll((Collection<? extends Comment>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
+			setBase_PackageableElement((PackageableElement)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__NOTE:
+			setNote((String)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
+			getReferencingContainer().clear();
+			getReferencingContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__FORMALISM:
+			setFormalism((String)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__URL:
+			setUrl((String)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENT__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -417,38 +454,39 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)null);
-				return;
-			case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				return;
-			case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
-				setBase_PackageableElement((PackageableElement)null);
-				return;
-			case RequirementsPackage.REQUIREMENT__NOTE:
-				setNote(NOTE_EDEFAULT);
-				return;
-			case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
-				getReferencingContainer().clear();
-				return;
-			case RequirementsPackage.REQUIREMENT__FORMALISM:
-				setFormalism(FORMALISM_EDEFAULT);
-				return;
-			case RequirementsPackage.REQUIREMENT__URL:
-				setUrl(URL_EDEFAULT);
-				return;
-			case RequirementsPackage.REQUIREMENT__MODE:
-				getMode().clear();
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)null);
+			return;
+		case RequirementsPackage.REQUIREMENT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			return;
+		case RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT:
+			setBase_PackageableElement((PackageableElement)null);
+			return;
+		case RequirementsPackage.REQUIREMENT__NOTE:
+			setNote(NOTE_EDEFAULT);
+			return;
+		case RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER:
+			getReferencingContainer().clear();
+			return;
+		case RequirementsPackage.REQUIREMENT__FORMALISM:
+			setFormalism(FORMALISM_EDEFAULT);
+			return;
+		case RequirementsPackage.REQUIREMENT__URL:
+			setUrl(URL_EDEFAULT);
+			return;
+		case RequirementsPackage.REQUIREMENT__MODE:
+			getMode().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -469,15 +507,13 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 			// Find DeriveReqt link
 			while(itDep.hasNext()) {
 				DirectedRelationship currentDirectedRelationship = itDep.next();
-				currentDeriveReqt = (DeriveReqt)UMLUtil.getStereotypeApplication(currentDirectedRelationship,
-						DeriveReqt.class);
+				currentDeriveReqt = (DeriveReqt)UMLUtil.getStereotypeApplication(currentDirectedRelationship, DeriveReqt.class);
 
 				if(currentDeriveReqt != null) {
 					EList<NamedElement> clients = currentDeriveReqt.getBase_Abstraction().getClients();
 					Iterator<NamedElement> it = clients.iterator();
 					while(it.hasNext()) {
-						Requirement currentRequirement = (Requirement)UMLUtil.getStereotypeApplication(it.next(),
-							Requirement.class);
+						Requirement currentRequirement = (Requirement)UMLUtil.getStereotypeApplication(it.next(), Requirement.class);
 						if(currentRequirement != null) {
 							derived.add(currentRequirement);
 						}
@@ -486,12 +522,12 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 			}
 		}
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<org.eclipse.papyrus.sysml.requirements.Requirement>(
-			org.eclipse.papyrus.sysml.requirements.Requirement.class, derived.size(), derived.toArray());
+		return new BasicInternalEList<org.eclipse.papyrus.sysml.requirements.Requirement>(org.eclipse.papyrus.sysml.requirements.Requirement.class, derived.size(), derived.toArray());
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFormalism() {
@@ -500,10 +536,11 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, RequirementsPackage.REQUIREMENT__MODE);
 		}
 		return mode;
@@ -520,6 +557,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getNote() {
@@ -528,10 +566,11 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getOwnedComment() {
-		if (ownedComment == null) {
+		if(ownedComment == null) {
 			ownedComment = new EObjectResolvingEList<Comment>(Comment.class, this, RequirementsPackage.REQUIREMENT__OWNED_COMMENT);
 		}
 		return ownedComment;
@@ -540,14 +579,15 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PackageableElement getBase_PackageableElement() {
-		if (base_PackageableElement != null && base_PackageableElement.eIsProxy()) {
+		if(base_PackageableElement != null && base_PackageableElement.eIsProxy()) {
 			InternalEObject oldBase_PackageableElement = (InternalEObject)base_PackageableElement;
 			base_PackageableElement = (PackageableElement)eResolveProxy(oldBase_PackageableElement);
-			if (base_PackageableElement != oldBase_PackageableElement) {
-				if (eNotificationRequired())
+			if(base_PackageableElement != oldBase_PackageableElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT, oldBase_PackageableElement, base_PackageableElement));
 			}
 		}
@@ -557,6 +597,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PackageableElement basicGetBase_PackageableElement() {
@@ -566,12 +607,13 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_PackageableElement(PackageableElement newBase_PackageableElement) {
 		PackageableElement oldBase_PackageableElement = base_PackageableElement;
 		base_PackageableElement = newBase_PackageableElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__BASE_PACKAGEABLE_ELEMENT, oldBase_PackageableElement, base_PackageableElement));
 	}
 
@@ -604,6 +646,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getUrl() {
@@ -612,12 +655,13 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFormalism(String newFormalism) {
 		String oldFormalism = formalism;
 		formalism = newFormalism;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__FORMALISM, oldFormalism, formalism));
 	}
 
@@ -632,14 +676,15 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getBase_NamedElement() {
-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {
+		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {
 			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;
 			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);
-			if (base_NamedElement != oldBase_NamedElement) {
-				if (eNotificationRequired())
+			if(base_NamedElement != oldBase_NamedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 			}
 		}
@@ -649,6 +694,7 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetBase_NamedElement() {
@@ -658,33 +704,36 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {
 		NamedElement oldBase_NamedElement = base_NamedElement;
 		base_NamedElement = newBase_NamedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNote(String newNote) {
 		String oldNote = note;
 		note = newNote;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__NOTE, oldNote, note));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsContainer> getReferencingContainer() {
-		if (referencingContainer == null) {
+		if(referencingContainer == null) {
 			referencingContainer = new EObjectResolvingEList<RequirementsContainer>(RequirementsContainer.class, this, RequirementsPackage.REQUIREMENT__REFERENCING_CONTAINER);
 		}
 		return referencingContainer;
@@ -692,22 +741,25 @@ public class RequirementImpl extends org.eclipse.papyrus.sysml.requirements.inte
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUrl(String newUrl) {
 		String oldUrl = url;
 		url = newUrl;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__URL, oldUrl, url));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (note: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementSpecificationObjectImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementSpecificationObjectImpl.java
index 3c0e2a3de10..5242a54b7c0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementSpecificationObjectImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementSpecificationObjectImpl.java
@@ -33,17 +33,20 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl#getReferencingContainer <em>Referencing Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementSpecificationObjectImpl#getReferencingContainer <em>Referencing Container</em>}
+ * </li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class RequirementSpecificationObjectImpl extends TraceableSpecificationImpl implements RequirementSpecificationObject {
+
 	/**
 	 * The cached value of the '{@link #getReferencingContainer() <em>Referencing Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReferencingContainer()
 	 * @generated
 	 * @ordered
@@ -53,6 +56,7 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementSpecificationObjectImpl() {
@@ -62,6 +66,7 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,10 +77,11 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsContainer> getReferencingContainer() {
-		if (referencingContainer == null) {
+		if(referencingContainer == null) {
 			referencingContainer = new EObjectResolvingEList<RequirementsContainer>(RequirementsContainer.class, this, RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER);
 		}
 		return referencingContainer;
@@ -84,13 +90,14 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
-				return getReferencingContainer();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
+			return getReferencingContainer();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -98,16 +105,17 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
-				getReferencingContainer().clear();
-				getReferencingContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
+			getReferencingContainer().clear();
+			getReferencingContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -115,14 +123,15 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
-				getReferencingContainer().clear();
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
+			getReferencingContainer().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -130,13 +139,14 @@ public abstract class RequirementSpecificationObjectImpl extends TraceableSpecif
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
-				return referencingContainer != null && !referencingContainer.isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT__REFERENCING_CONTAINER:
+			return referencingContainer != null && !referencingContainer.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsContainerImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsContainerImpl.java
index 497dc884dc1..6abd94ec84d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsContainerImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsContainerImpl.java
@@ -38,21 +38,23 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getChildContainer <em>Child Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getParentContainer <em>Parent Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getContainedReqSpecObject <em>Contained Req Spec Object</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getChildContainer <em>Child Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getParentContainer <em>Parent Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsContainerImpl#getContainedReqSpecObject <em>Contained Req Spec Object</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RequirementsContainerImpl extends TraceableSpecificationImpl implements RequirementsContainer {
+
 	/**
 	 * The cached value of the '{@link #getChildContainer() <em>Child Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getChildContainer()
 	 * @generated
 	 * @ordered
@@ -63,6 +65,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	 * The cached value of the '{@link #getParentContainer() <em>Parent Container</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getParentContainer()
 	 * @generated
 	 * @ordered
@@ -73,6 +76,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -83,6 +87,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -93,6 +98,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	 * The cached value of the '{@link #getContainedReqSpecObject() <em>Contained Req Spec Object</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getContainedReqSpecObject()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsContainerImpl() {
@@ -111,6 +118,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RequirementSpecificationObject basicGetContainedReqSpecObject() {
@@ -120,6 +128,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RequirementsContainer basicGetParentContainer() {
@@ -129,14 +138,18 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetParentContainer(RequirementsContainer newParentContainer, NotificationChain msgs) {
 		RequirementsContainer oldParentContainer = parentContainer;
 		parentContainer = newParentContainer;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER, oldParentContainer, newParentContainer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -144,25 +157,30 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				return getChildContainer();
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				if (resolve) return getParentContainer();
-				return basicGetParentContainer();
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
-				if (resolve) return getContainedReqSpecObject();
-				return basicGetContainedReqSpecObject();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			return getChildContainer();
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			if(resolve)
+				return getParentContainer();
+			return basicGetParentContainer();
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
+			if(resolve)
+				return getContainedReqSpecObject();
+			return basicGetContainedReqSpecObject();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -170,18 +188,19 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildContainer()).basicAdd(otherEnd, msgs);
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				if (parentContainer != null)
-					msgs = ((InternalEObject)parentContainer).eInverseRemove(this, RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER, RequirementsContainer.class, msgs);
-				return basicSetParentContainer((RequirementsContainer)otherEnd, msgs);
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildContainer()).basicAdd(otherEnd, msgs);
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			if(parentContainer != null)
+				msgs = ((InternalEObject)parentContainer).eInverseRemove(this, RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER, RequirementsContainer.class, msgs);
+			return basicSetParentContainer((RequirementsContainer)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -189,15 +208,16 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				return ((InternalEList<?>)getChildContainer()).basicRemove(otherEnd, msgs);
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				return basicSetParentContainer(null, msgs);
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			return ((InternalEList<?>)getChildContainer()).basicRemove(otherEnd, msgs);
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			return basicSetParentContainer(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -205,21 +225,22 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				return childContainer != null && !childContainer.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				return parentContainer != null;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
-				return base_Class != null;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
-				return base_Package != null;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
-				return containedReqSpecObject != null;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			return childContainer != null && !childContainer.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			return parentContainer != null;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
+			return base_Class != null;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
+			return base_Package != null;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
+			return containedReqSpecObject != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -227,28 +248,29 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				getChildContainer().clear();
-				getChildContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				setParentContainer((RequirementsContainer)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
-				setContainedReqSpecObject((RequirementSpecificationObject)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			getChildContainer().clear();
+			getChildContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			setParentContainer((RequirementsContainer)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
+			setContainedReqSpecObject((RequirementSpecificationObject)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -256,6 +278,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,26 +289,27 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
-				getChildContainer().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
-				setParentContainer((RequirementsContainer)null);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
-				setContainedReqSpecObject((RequirementSpecificationObject)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER:
+			getChildContainer().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER:
+			setParentContainer((RequirementsContainer)null);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT:
+			setContainedReqSpecObject((RequirementSpecificationObject)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -293,10 +317,11 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsContainer> getChildContainer() {
-		if (childContainer == null) {
+		if(childContainer == null) {
 			childContainer = new EObjectWithInverseResolvingEList<RequirementsContainer>(RequirementsContainer.class, this, RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER, RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER);
 		}
 		return childContainer;
@@ -305,14 +330,15 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RequirementSpecificationObject getContainedReqSpecObject() {
-		if (containedReqSpecObject != null && containedReqSpecObject.eIsProxy()) {
+		if(containedReqSpecObject != null && containedReqSpecObject.eIsProxy()) {
 			InternalEObject oldContainedReqSpecObject = (InternalEObject)containedReqSpecObject;
 			containedReqSpecObject = (RequirementSpecificationObject)eResolveProxy(oldContainedReqSpecObject);
-			if (containedReqSpecObject != oldContainedReqSpecObject) {
-				if (eNotificationRequired())
+			if(containedReqSpecObject != oldContainedReqSpecObject) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT, oldContainedReqSpecObject, containedReqSpecObject));
 			}
 		}
@@ -322,14 +348,15 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RequirementsContainer getParentContainer() {
-		if (parentContainer != null && parentContainer.eIsProxy()) {
+		if(parentContainer != null && parentContainer.eIsProxy()) {
 			InternalEObject oldParentContainer = (InternalEObject)parentContainer;
 			parentContainer = (RequirementsContainer)eResolveProxy(oldParentContainer);
-			if (parentContainer != oldParentContainer) {
-				if (eNotificationRequired())
+			if(parentContainer != oldParentContainer) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER, oldParentContainer, parentContainer));
 			}
 		}
@@ -339,45 +366,48 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setContainedReqSpecObject(RequirementSpecificationObject newContainedReqSpecObject) {
 		RequirementSpecificationObject oldContainedReqSpecObject = containedReqSpecObject;
 		containedReqSpecObject = newContainedReqSpecObject;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_CONTAINER__CONTAINED_REQ_SPEC_OBJECT, oldContainedReqSpecObject, containedReqSpecObject));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentContainer(RequirementsContainer newParentContainer) {
-		if (newParentContainer != parentContainer) {
+		if(newParentContainer != parentContainer) {
 			NotificationChain msgs = null;
-			if (parentContainer != null)
+			if(parentContainer != null)
 				msgs = ((InternalEObject)parentContainer).eInverseRemove(this, RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER, RequirementsContainer.class, msgs);
-			if (newParentContainer != null)
+			if(newParentContainer != null)
 				msgs = ((InternalEObject)newParentContainer).eInverseAdd(this, RequirementsPackage.REQUIREMENTS_CONTAINER__CHILD_CONTAINER, RequirementsContainer.class, msgs);
 			msgs = basicSetParentContainer(newParentContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_CONTAINER__PARENT_CONTAINER, newParentContainer, newParentContainer));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -387,6 +417,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -396,26 +427,28 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -425,6 +458,7 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -434,12 +468,13 @@ public class RequirementsContainerImpl extends TraceableSpecificationImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsFactoryImpl.java
index 5225cab2b82..c3378706601 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsFactoryImpl.java
@@ -44,12 +44,14 @@ import org.eclipse.papyrus.eastadl.requirements.UseCase;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class RequirementsFactoryImpl extends EFactoryImpl implements RequirementsFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -61,16 +63,16 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static RequirementsFactory init() {

 		try {

 			RequirementsFactory theRequirementsFactory = (RequirementsFactory)EPackage.Registry.INSTANCE.getEFactory(RequirementsPackage.eNS_URI);

-			if (theRequirementsFactory != null) {

+			if(theRequirementsFactory != null) {

 				return theRequirementsFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new RequirementsFactoryImpl();

@@ -79,6 +81,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsFactoryImpl() {

@@ -87,6 +90,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertQualityRequirementKindToString(EDataType eDataType, Object instanceValue) {

@@ -95,49 +99,68 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case RequirementsPackage.QUALITY_REQUIREMENT_KIND:

-				return convertQualityRequirementKindToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case RequirementsPackage.QUALITY_REQUIREMENT_KIND:

+			return convertQualityRequirementKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case RequirementsPackage.QUALITY_REQUIREMENT: return createQualityRequirement();

-			case RequirementsPackage.REQUIREMENT: return createRequirement();

-			case RequirementsPackage.REQUIREMENTS_CONTAINER: return createRequirementsContainer();

-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION: return createRequirementsRelatedInformation();

-			case RequirementsPackage.SATISFY: return createSatisfy();

-			case RequirementsPackage.USE_CASE: return createUseCase();

-			case RequirementsPackage.INCLUDE: return createInclude();

-			case RequirementsPackage.EXTEND: return createExtend();

-			case RequirementsPackage.EXTENSION_POINT: return createExtensionPoint();

-			case RequirementsPackage.REFINE: return createRefine();

-			case RequirementsPackage.DERIVE_REQUIREMENT: return createDeriveRequirement();

-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP: return createRequirementsRelationGroup();

-			case RequirementsPackage.REQUIREMENTS_LINK: return createRequirementsLink();

-			case RequirementsPackage.REQUIREMENTS_MODEL: return createRequirementsModel();

-			case RequirementsPackage.OPERATIONAL_SITUATION: return createOperationalSituation();

-			case RequirementsPackage.ACTOR: return createActor();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case RequirementsPackage.QUALITY_REQUIREMENT:

+			return createQualityRequirement();

+		case RequirementsPackage.REQUIREMENT:

+			return createRequirement();

+		case RequirementsPackage.REQUIREMENTS_CONTAINER:

+			return createRequirementsContainer();

+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION:

+			return createRequirementsRelatedInformation();

+		case RequirementsPackage.SATISFY:

+			return createSatisfy();

+		case RequirementsPackage.USE_CASE:

+			return createUseCase();

+		case RequirementsPackage.INCLUDE:

+			return createInclude();

+		case RequirementsPackage.EXTEND:

+			return createExtend();

+		case RequirementsPackage.EXTENSION_POINT:

+			return createExtensionPoint();

+		case RequirementsPackage.REFINE:

+			return createRefine();

+		case RequirementsPackage.DERIVE_REQUIREMENT:

+			return createDeriveRequirement();

+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP:

+			return createRequirementsRelationGroup();

+		case RequirementsPackage.REQUIREMENTS_LINK:

+			return createRequirementsLink();

+		case RequirementsPackage.REQUIREMENTS_MODEL:

+			return createRequirementsModel();

+		case RequirementsPackage.OPERATIONAL_SITUATION:

+			return createOperationalSituation();

+		case RequirementsPackage.ACTOR:

+			return createActor();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeriveRequirement createDeriveRequirement() {

@@ -147,21 +170,23 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case RequirementsPackage.QUALITY_REQUIREMENT_KIND:

-				return createQualityRequirementKindFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case RequirementsPackage.QUALITY_REQUIREMENT_KIND:

+			return createQualityRequirementKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public OperationalSituation createOperationalSituation() {

@@ -172,6 +197,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Actor createActor() {

@@ -181,6 +207,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public QualityRequirement createQualityRequirement() {

@@ -190,17 +217,20 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public QualityRequirementKind createQualityRequirementKindFromString(EDataType eDataType, String initialValue) {

 		QualityRequirementKind result = QualityRequirementKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Refine createRefine() {

@@ -211,6 +241,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Requirement createRequirement() {

@@ -221,6 +252,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsContainer createRequirementsContainer() {

@@ -231,6 +263,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsLink createRequirementsLink() {

@@ -241,6 +274,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsModel createRequirementsModel() {

@@ -251,6 +285,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsRelatedInformation createRequirementsRelatedInformation() {

@@ -261,6 +296,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsRelationGroup createRequirementsRelationGroup() {

@@ -271,6 +307,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Satisfy createSatisfy() {

@@ -281,6 +318,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UseCase createUseCase() {

@@ -291,6 +329,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Include createInclude() {

@@ -301,6 +340,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Extend createExtend() {

@@ -311,6 +351,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ExtensionPoint createExtensionPoint() {

@@ -320,6 +361,7 @@ public class RequirementsFactoryImpl extends EFactoryImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsPackage getRequirementsPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsLinkImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsLinkImpl.java
index 949aeb352ed..0e61eb3c9f3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsLinkImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsLinkImpl.java
@@ -34,19 +34,21 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#isIsBidirectional <em>Is Bidirectional</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#isIsBidirectional <em>Is Bidirectional</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsLinkImpl#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RequirementsLinkImpl extends RequirementsRelationshipImpl implements RequirementsLink {
+
 	/**
 	 * The default value of the '{@link #isIsBidirectional() <em>Is Bidirectional</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsBidirectional()
 	 * @generated
 	 * @ordered
@@ -57,6 +59,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	 * The cached value of the '{@link #isIsBidirectional() <em>Is Bidirectional</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsBidirectional()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -77,6 +81,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
@@ -86,6 +91,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsLinkImpl() {
@@ -95,17 +101,18 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
-				return isIsBidirectional();
-			case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
-				return getSource();
-			case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
-				return getTarget();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
+			return isIsBidirectional();
+		case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
+			return getSource();
+		case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
+			return getTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -113,17 +120,18 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
-				return isBidirectional != IS_BIDIRECTIONAL_EDEFAULT;
-			case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
-				return source != null && !source.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
-				return target != null && !target.isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
+			return isBidirectional != IS_BIDIRECTIONAL_EDEFAULT;
+		case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
+			return source != null && !source.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
+			return target != null && !target.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -131,23 +139,24 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
-				setIsBidirectional((Boolean)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
-				getSource().clear();
-				getSource().addAll((Collection<? extends Requirement>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
-				getTarget().clear();
-				getTarget().addAll((Collection<? extends Requirement>)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
+			setIsBidirectional((Boolean)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
+			getSource().clear();
+			getSource().addAll((Collection<? extends Requirement>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
+			getTarget().clear();
+			getTarget().addAll((Collection<? extends Requirement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -155,6 +164,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -165,20 +175,21 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
-				setIsBidirectional(IS_BIDIRECTIONAL_EDEFAULT);
-				return;
-			case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
-				getSource().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
-				getTarget().clear();
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL:
+			setIsBidirectional(IS_BIDIRECTIONAL_EDEFAULT);
+			return;
+		case RequirementsPackage.REQUIREMENTS_LINK__SOURCE:
+			getSource().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_LINK__TARGET:
+			getTarget().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -186,10 +197,11 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getSource() {
-		if (source == null) {
+		if(source == null) {
 			source = new EObjectResolvingEList<Requirement>(Requirement.class, this, RequirementsPackage.REQUIREMENTS_LINK__SOURCE);
 		}
 		return source;
@@ -198,10 +210,11 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Requirement> getTarget() {
-		if (target == null) {
+		if(target == null) {
 			target = new EObjectResolvingEList<Requirement>(Requirement.class, this, RequirementsPackage.REQUIREMENTS_LINK__TARGET);
 		}
 		return target;
@@ -210,6 +223,7 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsBidirectional() {
@@ -219,23 +233,26 @@ public class RequirementsLinkImpl extends RequirementsRelationshipImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsBidirectional(boolean newIsBidirectional) {
 		boolean oldIsBidirectional = isBidirectional;
 		isBidirectional = newIsBidirectional;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_LINK__IS_BIDIRECTIONAL, oldIsBidirectional, isBidirectional));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isBidirectional: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsModelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsModelImpl.java
index 293133ddc95..711e0b86191 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsModelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsModelImpl.java
@@ -39,21 +39,23 @@ import org.eclipse.uml2.uml.UseCase;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getUseCase <em>Use Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getRequirement <em>Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getRequirementContainer <em>Requirement Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getOperationalSituation <em>Operational Situation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getUseCase <em>Use Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getRequirement <em>Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getRequirementContainer <em>Requirement Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getOperationalSituation <em>Operational Situation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsModelImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RequirementsModelImpl extends ContextImpl implements RequirementsModel {
+
 	/**
 	 * The cached value of the '{@link #getUseCase() <em>Use Case</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUseCase()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	 * The cached value of the '{@link #getRequirement() <em>Requirement</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRequirement()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	 * The cached value of the '{@link #getRequirementContainer() <em>Requirement Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRequirementContainer()
 	 * @generated
 	 * @ordered
@@ -84,6 +88,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	 * The cached value of the '{@link #getOperationalSituation() <em>Operational Situation</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOperationalSituation()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -103,6 +109,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsModelImpl() {
@@ -112,22 +119,24 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
-				return getUseCase();
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
-				return getRequirement();
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
-				return getRequirementContainer();
-			case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
-				return getOperationalSituation();
-			case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
+			return getUseCase();
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
+			return getRequirement();
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
+			return getRequirementContainer();
+		case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
+			return getOperationalSituation();
+		case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -135,21 +144,22 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
-				return useCase != null && !useCase.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
-				return requirement != null && !requirement.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
-				return requirementContainer != null && !requirementContainer.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
-				return operationalSituation != null && !operationalSituation.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
+			return useCase != null && !useCase.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
+			return requirement != null && !requirement.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
+			return requirementContainer != null && !requirementContainer.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
+			return operationalSituation != null && !operationalSituation.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -157,31 +167,32 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
-				getUseCase().clear();
-				getUseCase().addAll((Collection<? extends UseCase>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
-				getRequirement().clear();
-				getRequirement().addAll((Collection<? extends RequirementSpecificationObject>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
-				getRequirementContainer().clear();
-				getRequirementContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
-				getOperationalSituation().clear();
-				getOperationalSituation().addAll((Collection<? extends OperationalSituation>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
+			getUseCase().clear();
+			getUseCase().addAll((Collection<? extends UseCase>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
+			getRequirement().clear();
+			getRequirement().addAll((Collection<? extends RequirementSpecificationObject>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
+			getRequirementContainer().clear();
+			getRequirementContainer().addAll((Collection<? extends RequirementsContainer>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
+			getOperationalSituation().clear();
+			getOperationalSituation().addAll((Collection<? extends OperationalSituation>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -189,6 +200,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,26 +211,27 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
-				getUseCase().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
-				getRequirement().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
-				getRequirementContainer().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
-				getOperationalSituation().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE:
+			getUseCase().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT:
+			getRequirement().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER:
+			getRequirementContainer().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION:
+			getOperationalSituation().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -226,10 +239,11 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<OperationalSituation> getOperationalSituation() {
-		if (operationalSituation == null) {
+		if(operationalSituation == null) {
 			operationalSituation = new EObjectResolvingEList<OperationalSituation>(OperationalSituation.class, this, RequirementsPackage.REQUIREMENTS_MODEL__OPERATIONAL_SITUATION);
 		}
 		return operationalSituation;
@@ -238,14 +252,15 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -255,6 +270,7 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -264,22 +280,24 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementSpecificationObject> getRequirement() {
-		if (requirement == null) {
+		if(requirement == null) {
 			requirement = new EObjectResolvingEList<RequirementSpecificationObject>(RequirementSpecificationObject.class, this, RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT);
 		}
 		return requirement;
@@ -288,10 +306,11 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsContainer> getRequirementContainer() {
-		if (requirementContainer == null) {
+		if(requirementContainer == null) {
 			requirementContainer = new EObjectResolvingEList<RequirementsContainer>(RequirementsContainer.class, this, RequirementsPackage.REQUIREMENTS_MODEL__REQUIREMENT_CONTAINER);
 		}
 		return requirementContainer;
@@ -300,10 +319,11 @@ public class RequirementsModelImpl extends ContextImpl implements RequirementsMo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UseCase> getUseCase() {
-		if (useCase == null) {
+		if(useCase == null) {
 			useCase = new EObjectResolvingEList<UseCase>(UseCase.class, this, RequirementsPackage.REQUIREMENTS_MODEL__USE_CASE);
 		}
 		return useCase;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsPackageImpl.java
index 34d3c95bd73..8aa35182ace 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsPackageImpl.java
@@ -100,17 +100,19 @@ import org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl;
 import org.eclipse.papyrus.sysml.SysmlPackage;

 import org.eclipse.uml2.types.TypesPackage;

 import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.l2.L2Package;

+import org.eclipse.uml2.uml.profile.standard.StandardPackage;

 

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class RequirementsPackageImpl extends EPackageImpl implements RequirementsPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -118,16 +120,18 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * 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 RequirementsPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link RequirementsPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static RequirementsPackage init() {

-		if (isInited) return (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

+		if(isInited)

+			return (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

 

 		// Obtain or create and register package

 		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementsPackageImpl());

@@ -229,7 +233,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		// Mark meta-data to indicate it can't be changed

 		theRequirementsPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(RequirementsPackage.eNS_URI, theRequirementsPackage);

 		return theRequirementsPackage;

@@ -237,6 +241,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass qualityRequirementEClass = null;

@@ -244,6 +249,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementSpecificationObjectEClass = null;

@@ -251,6 +257,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsContainerEClass = null;

@@ -258,6 +265,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsRelatedInformationEClass = null;

@@ -265,6 +273,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsRelationshipEClass = null;

@@ -272,6 +281,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass satisfyEClass = null;

@@ -279,6 +289,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass useCaseEClass = null;

@@ -286,6 +297,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass includeEClass = null;

@@ -293,6 +305,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass extendEClass = null;

@@ -300,6 +313,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass extensionPointEClass = null;

@@ -307,6 +321,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass redefinableElementEClass = null;

@@ -314,6 +329,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass refineEClass = null;

@@ -321,6 +337,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass deriveRequirementEClass = null;

@@ -328,6 +345,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsRelationGroupEClass = null;

@@ -335,6 +353,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsLinkEClass = null;

@@ -342,6 +361,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementsModelEClass = null;

@@ -349,6 +369,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass operationalSituationEClass = null;

@@ -356,6 +377,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass actorEClass = null;

@@ -363,37 +385,40 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass requirementEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum qualityRequirementKindEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage#eNS_URI

 	 * @see #init()

@@ -404,13 +429,15 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -505,6 +532,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getDeriveRequirement() {

@@ -514,6 +542,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDeriveRequirement_Derived() {

@@ -523,6 +552,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDeriveRequirement_DerivedFrom() {

@@ -532,6 +562,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getOperationalSituation() {

@@ -541,6 +572,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getOperationalSituation_Base_Class() {

@@ -550,6 +582,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getActor() {

@@ -559,6 +592,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getActor_Base_Actor() {

@@ -567,6 +601,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getQualityRequirement() {

@@ -575,6 +610,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getQualityRequirement_QualityRequirementType() {

@@ -583,6 +619,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getQualityRequirementKind() {

@@ -592,6 +629,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRefine() {

@@ -601,6 +639,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRefine_RefinedBy() {

@@ -610,6 +649,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRefine_Base_Dependency() {

@@ -619,6 +659,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRefine_RefinedBy_path() {

@@ -628,6 +669,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRefine_RefinedRequirement() {

@@ -637,6 +679,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirement() {

@@ -646,6 +689,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getRequirement_Formalism() {

@@ -655,6 +699,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirement_Mode() {

@@ -664,6 +709,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getRequirement_Url() {

@@ -673,6 +719,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsContainer() {

@@ -682,6 +729,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsContainer_ChildContainer() {

@@ -691,6 +739,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsContainer_ContainedReqSpecObject() {

@@ -700,6 +749,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsContainer_ParentContainer() {

@@ -709,6 +759,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsContainer_Base_Class() {

@@ -718,6 +769,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsContainer_Base_Package() {

@@ -726,6 +778,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsFactory getRequirementsFactory() {

@@ -735,6 +788,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsLink() {

@@ -744,6 +798,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getRequirementsLink_IsBidirectional() {

@@ -753,6 +808,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsLink_Source() {

@@ -762,6 +818,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsLink_Target() {

@@ -771,6 +828,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsModel() {

@@ -780,6 +838,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsModel_OperationalSituation() {

@@ -789,6 +848,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsModel_Base_Package() {

@@ -798,6 +858,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsModel_Requirement() {

@@ -807,6 +868,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsModel_RequirementContainer() {

@@ -816,6 +878,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsModel_UseCase() {

@@ -825,6 +888,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementSpecificationObject() {

@@ -834,6 +898,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementSpecificationObject_ReferencingContainer() {

@@ -843,6 +908,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsRelatedInformation() {

@@ -852,6 +918,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsRelatedInformation_Base_Class() {

@@ -861,6 +928,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsRelationGroup() {

@@ -870,6 +938,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsRelationGroup_Relation() {

@@ -879,6 +948,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsRelationGroup_Base_Class() {

@@ -888,6 +958,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsRelationGroup_Base_Package() {

@@ -897,6 +968,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRequirementsRelationship() {

@@ -906,6 +978,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRequirementsRelationship_Base_Class() {

@@ -915,6 +988,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getSatisfy() {

@@ -924,6 +998,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSatisfy_SatisfiedBy() {

@@ -933,6 +1008,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSatisfy_SatisfiedBy_path() {

@@ -942,6 +1018,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getUseCase() {

@@ -951,6 +1028,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUseCase_Base_UseCase() {

@@ -960,6 +1038,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUseCase_Include() {

@@ -969,6 +1048,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUseCase_Extend() {

@@ -978,6 +1058,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUseCase_ExtensionPoint() {

@@ -987,6 +1068,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getInclude() {

@@ -996,6 +1078,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getInclude_Base_Include() {

@@ -1005,6 +1088,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getInclude_Addition() {

@@ -1014,6 +1098,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getExtend() {

@@ -1023,6 +1108,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getExtend_Base_Extend() {

@@ -1032,6 +1118,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getExtend_ExtendedCase() {

@@ -1041,6 +1128,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getExtend_ExtensionLocation() {

@@ -1050,6 +1138,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getExtensionPoint() {

@@ -1059,6 +1148,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getExtensionPoint_Base_ExtensionPoint() {

@@ -1068,6 +1158,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getRedefinableElement() {

@@ -1077,6 +1168,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getRedefinableElement_Base_RedefinableElement() {

@@ -1086,6 +1178,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSatisfy_SatisfiedRequirement() {

@@ -1095,6 +1188,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSatisfy_SatisfiedUseCase() {

@@ -1102,13 +1196,15 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

@@ -1123,7 +1219,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		BehaviorPackage theBehaviorPackage = (BehaviorPackage)EPackage.Registry.INSTANCE.getEPackage(BehaviorPackage.eNS_URI);

 		ElementsPackage theElementsPackage = (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI);

 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		L2Package theL2Package = (L2Package)EPackage.Registry.INSTANCE.getEPackage(L2Package.eNS_URI);

+		StandardPackage theStandardPackage = (StandardPackage)EPackage.Registry.INSTANCE.getEPackage(StandardPackage.eNS_URI);

 

 		// Add subpackages

 		getESubpackages().add(theVerificationvalidationPackage);

@@ -1147,7 +1243,7 @@ public class RequirementsPackageImpl extends EPackageImpl implements Requirement
 		extendEClass.getESuperTypes().add(theElementsPackage.getRelationship());

 		extensionPointEClass.getESuperTypes().add(this.getRedefinableElement());

 		refineEClass.getESuperTypes().add(this.getRequirementsRelationship());

-		refineEClass.getESuperTypes().add(theL2Package.getRefine());

+		refineEClass.getESuperTypes().add(theStandardPackage.getRefine());

 		deriveRequirementEClass.getESuperTypes().add(this.getRequirementsRelationship());

 		deriveRequirementEClass.getESuperTypes().add(theRequirementsPackage_1.getDeriveReqt());

 		requirementsRelationGroupEClass.getESuperTypes().add(theElementsPackage.getTraceableSpecification());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelatedInformationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelatedInformationImpl.java
index 0bed5488730..c19f6d01bb2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelatedInformationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelatedInformationImpl.java
@@ -30,25 +30,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelatedInformationImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RequirementsRelatedInformationImpl extends RequirementSpecificationObjectImpl implements RequirementsRelatedInformation {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
 	 */
 	protected org.eclipse.uml2.uml.Class base_Class;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsRelatedInformationImpl() {
@@ -58,14 +62,16 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -73,13 +79,14 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -87,14 +94,15 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -102,6 +110,7 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,14 +121,15 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -129,6 +139,7 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -138,26 +149,28 @@ public class RequirementsRelatedInformationImpl extends RequirementSpecification
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationGroupImpl.java
index 3216288b57c..7143cf2eec9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationGroupImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getRelation <em>Relation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationGroupImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl implements RequirementsRelationGroup {
+
 	/**
 	 * The cached value of the '{@link #getRelation() <em>Relation</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRelation()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsRelationGroupImpl() {
@@ -87,19 +92,22 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
-				return getRelation();
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
+			return getRelation();
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +115,18 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
-				return relation != null && !relation.isEmpty();
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
-				return base_Class != null;
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
+			return relation != null && !relation.isEmpty();
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
+			return base_Class != null;
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,22 +134,23 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
-				getRelation().clear();
-				getRelation().addAll((Collection<? extends RequirementsLink>)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
+			getRelation().clear();
+			getRelation().addAll((Collection<? extends RequirementsLink>)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,20 +169,21 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
-				getRelation().clear();
-				return;
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION:
+			getRelation().clear();
+			return;
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -179,10 +191,11 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<RequirementsLink> getRelation() {
-		if (relation == null) {
+		if(relation == null) {
 			relation = new EObjectResolvingEList<RequirementsLink>(RequirementsLink.class, this, RequirementsPackage.REQUIREMENTS_RELATION_GROUP__RELATION);
 		}
 		return relation;
@@ -191,14 +204,15 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -208,6 +222,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -217,26 +232,28 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -246,6 +263,7 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -255,12 +273,13 @@ public class RequirementsRelationGroupImpl extends TraceableSpecificationImpl im
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_RELATION_GROUP__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationshipImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationshipImpl.java
index 7a568d2b2ee..a89b794490f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationshipImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/RequirementsRelationshipImpl.java
@@ -31,25 +31,29 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.RequirementsRelationshipImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class RequirementsRelationshipImpl extends RelationshipImpl implements RequirementsRelationship {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
 	 */
 	protected org.eclipse.uml2.uml.Class base_Class;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RequirementsRelationshipImpl() {
@@ -59,14 +63,16 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -74,13 +80,14 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -88,15 +95,16 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	
+
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -104,6 +112,7 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,14 +123,15 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -131,6 +141,7 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -140,26 +151,28 @@ public abstract class RequirementsRelationshipImpl extends RelationshipImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.REQUIREMENTS_RELATIONSHIP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/SatisfyImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/SatisfyImpl.java
index f643bc12366..3986203fe92 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/SatisfyImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/SatisfyImpl.java
@@ -33,8 +33,7 @@ import org.eclipse.papyrus.eastadl.requirements.UseCase;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.profile.l2.L2Package;
-import org.eclipse.uml2.uml.profile.l2.Trace;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 
@@ -44,14 +43,14 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedRequirement <em>Satisfied Requirement</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedBy <em>Satisfied By</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedBy_path <em>Satisfied By path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedUseCase <em>Satisfied Use Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedRequirement <em>Satisfied Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedBy <em>Satisfied By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedBy_path <em>Satisfied By path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.SatisfyImpl#getSatisfiedUseCase <em>Satisfied Use Case</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy {
@@ -60,6 +59,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Abstraction()
 	 * @generated
 	 * @ordered
@@ -70,6 +70,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	 * The cached value of the '{@link #getSatisfiedBy_path() <em>Satisfied By path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSatisfiedBy_path()
 	 * @generated
 	 * @ordered
@@ -79,6 +80,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * The cached value of the '{@link #getSatisfiedUseCase() <em>Satisfied Use Case</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSatisfiedUseCase()
 	 * @generated
 	 * @ordered
@@ -87,6 +89,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SatisfyImpl() {
@@ -96,6 +99,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction basicGetBase_Abstraction() {
@@ -105,19 +109,23 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (derivedFeatureID) {
-				case RequirementsPackage.SATISFY__BASE_ABSTRACTION: return L2Package.TRACE__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(derivedFeatureID) {
+			case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
+				return StandardPackage.TRACE__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == org.eclipse.papyrus.sysml.requirements.Satisfy.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
+		if(baseClass == org.eclipse.papyrus.sysml.requirements.Satisfy.class) {
+			switch(derivedFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -126,19 +134,23 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (baseFeatureID) {
-				case L2Package.TRACE__BASE_ABSTRACTION: return RequirementsPackage.SATISFY__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(baseFeatureID) {
+			case StandardPackage.TRACE__BASE_ABSTRACTION:
+				return RequirementsPackage.SATISFY__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == org.eclipse.papyrus.sysml.requirements.Satisfy.class) {
-			switch (baseFeatureID) {
-				default: return -1;
+		if(baseClass == org.eclipse.papyrus.sysml.requirements.Satisfy.class) {
+			switch(baseFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -146,72 +158,77 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
-				if (resolve) return getBase_Abstraction();
-				return basicGetBase_Abstraction();
-			case RequirementsPackage.SATISFY__SATISFIED_REQUIREMENT:
-				return getSatisfiedRequirement();
-			case RequirementsPackage.SATISFY__SATISFIED_BY:
-				return getSatisfiedBy();
-			case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
-				return getSatisfiedBy_path();
-			case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
-				return getSatisfiedUseCase();
+		switch(featureID) {
+		case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
+			if(resolve)
+				return getBase_Abstraction();
+			return basicGetBase_Abstraction();
+		case RequirementsPackage.SATISFY__SATISFIED_REQUIREMENT:
+			return getSatisfiedRequirement();
+		case RequirementsPackage.SATISFY__SATISFIED_BY:
+			return getSatisfiedBy();
+		case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
+			return getSatisfiedBy_path();
+		case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
+			return getSatisfiedUseCase();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
-				return base_Abstraction != null;
-			case RequirementsPackage.SATISFY__SATISFIED_REQUIREMENT:
-				return !getSatisfiedRequirement().isEmpty();
-			case RequirementsPackage.SATISFY__SATISFIED_BY:
-				return !getSatisfiedBy().isEmpty();
-			case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
-				return satisfiedBy_path != null && !satisfiedBy_path.isEmpty();
-			case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
-				return satisfiedUseCase != null && !satisfiedUseCase.isEmpty();
+		switch(featureID) {
+		case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
+			return base_Abstraction != null;
+		case RequirementsPackage.SATISFY__SATISFIED_REQUIREMENT:
+			return !getSatisfiedRequirement().isEmpty();
+		case RequirementsPackage.SATISFY__SATISFIED_BY:
+			return !getSatisfiedBy().isEmpty();
+		case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
+			return satisfiedBy_path != null && !satisfiedBy_path.isEmpty();
+		case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
+			return satisfiedUseCase != null && !satisfiedUseCase.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)newValue);
-				return;
-			case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
-				getSatisfiedBy_path().clear();
-				getSatisfiedBy_path().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
-				getSatisfiedUseCase().clear();
-				getSatisfiedUseCase().addAll((Collection<? extends UseCase>)newValue);
-				return;
+		switch(featureID) {
+		case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)newValue);
+			return;
+		case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
+			getSatisfiedBy_path().clear();
+			getSatisfiedBy_path().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
+			getSatisfiedUseCase().clear();
+			getSatisfiedUseCase().addAll((Collection<? extends UseCase>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -221,20 +238,21 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)null);
-				return;
-			case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
-				getSatisfiedBy_path().clear();
-				return;
-			case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
-				getSatisfiedUseCase().clear();
-				return;
+		switch(featureID) {
+		case RequirementsPackage.SATISFY__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)null);
+			return;
+		case RequirementsPackage.SATISFY__SATISFIED_BY_PATH:
+			getSatisfiedBy_path().clear();
+			return;
+		case RequirementsPackage.SATISFY__SATISFIED_USE_CASE:
+			getSatisfiedUseCase().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -242,14 +260,15 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction getBase_Abstraction() {
-		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {
+		if(base_Abstraction != null && base_Abstraction.eIsProxy()) {
 			InternalEObject oldBase_Abstraction = (InternalEObject)base_Abstraction;
 			base_Abstraction = (Abstraction)eResolveProxy(oldBase_Abstraction);
-			if (base_Abstraction != oldBase_Abstraction) {
-				if (eNotificationRequired())
+			if(base_Abstraction != oldBase_Abstraction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.SATISFY__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 			}
 		}
@@ -280,10 +299,11 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getSatisfiedBy_path() {
-		if (satisfiedBy_path == null) {
+		if(satisfiedBy_path == null) {
 			satisfiedBy_path = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, RequirementsPackage.SATISFY__SATISFIED_BY_PATH);
 		}
 		return satisfiedBy_path;
@@ -305,9 +325,7 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 				Element current = it.next();
 
 				// Test if currentProperty is stereotyped ADLRequirement
-				requirement = (Requirement)UMLUtil
-					.getStereotypeApplication(current,
-						Requirement.class);
+				requirement = (Requirement)UMLUtil.getStereotypeApplication(current, Requirement.class);
 
 				if(requirement != null) {
 					results.add(requirement);
@@ -321,10 +339,11 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UseCase> getSatisfiedUseCase() {
-		if (satisfiedUseCase == null) {
+		if(satisfiedUseCase == null) {
 			satisfiedUseCase = new EObjectResolvingEList<UseCase>(UseCase.class, this, RequirementsPackage.SATISFY__SATISFIED_USE_CASE);
 		}
 		return satisfiedUseCase;
@@ -333,12 +352,13 @@ public class SatisfyImpl extends RequirementsRelationshipImpl implements Satisfy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Abstraction(Abstraction newBase_Abstraction) {
 		Abstraction oldBase_Abstraction = base_Abstraction;
 		base_Abstraction = newBase_Abstraction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.SATISFY__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/UseCaseImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/UseCaseImpl.java
index 1663f478e85..4ae35bbc01a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/UseCaseImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/impl/UseCaseImpl.java
@@ -39,20 +39,22 @@ import org.eclipse.papyrus.eastadl.requirements.UseCase;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getBase_UseCase <em>Base Use Case</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getInclude <em>Include</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getExtend <em>Extend</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getExtensionPoint <em>Extension Point</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getBase_UseCase <em>Base Use Case</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getInclude <em>Include</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getExtend <em>Extend</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.impl.UseCaseImpl#getExtensionPoint <em>Extension Point</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {

+

 	/**

 	 * The cached value of the '{@link #getBase_UseCase() <em>Base Use Case</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_UseCase()

 	 * @generated

 	 * @ordered

@@ -63,6 +65,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	 * The cached value of the '{@link #getInclude() <em>Include</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getInclude()

 	 * @generated

 	 * @ordered

@@ -73,6 +76,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	 * The cached value of the '{@link #getExtend() <em>Extend</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getExtend()

 	 * @generated

 	 * @ordered

@@ -83,6 +87,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	 * The cached value of the '{@link #getExtensionPoint() <em>Extension Point</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getExtensionPoint()

 	 * @generated

 	 * @ordered

@@ -92,6 +97,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected UseCaseImpl() {

@@ -101,6 +107,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -111,14 +118,15 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.UseCase getBase_UseCase() {

-		if (base_UseCase != null && base_UseCase.eIsProxy()) {

+		if(base_UseCase != null && base_UseCase.eIsProxy()) {

 			InternalEObject oldBase_UseCase = (InternalEObject)base_UseCase;

 			base_UseCase = (org.eclipse.uml2.uml.UseCase)eResolveProxy(oldBase_UseCase);

-			if (base_UseCase != oldBase_UseCase) {

-				if (eNotificationRequired())

+			if(base_UseCase != oldBase_UseCase) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.USE_CASE__BASE_USE_CASE, oldBase_UseCase, base_UseCase));

 			}

 		}

@@ -128,6 +136,7 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.UseCase basicGetBase_UseCase() {

@@ -137,22 +146,24 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_UseCase(org.eclipse.uml2.uml.UseCase newBase_UseCase) {

 		org.eclipse.uml2.uml.UseCase oldBase_UseCase = base_UseCase;

 		base_UseCase = newBase_UseCase;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.USE_CASE__BASE_USE_CASE, oldBase_UseCase, base_UseCase));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<Include> getInclude() {

-		if (include == null) {

+		if(include == null) {

 			include = new EObjectContainmentEList<Include>(Include.class, this, RequirementsPackage.USE_CASE__INCLUDE);

 		}

 		return include;

@@ -161,10 +172,11 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<Extend> getExtend() {

-		if (extend == null) {

+		if(extend == null) {

 			extend = new EObjectContainmentEList<Extend>(Extend.class, this, RequirementsPackage.USE_CASE__EXTEND);

 		}

 		return extend;

@@ -173,10 +185,11 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<ExtensionPoint> getExtensionPoint() {

-		if (extensionPoint == null) {

+		if(extensionPoint == null) {

 			extensionPoint = new EObjectContainmentEList<ExtensionPoint>(ExtensionPoint.class, this, RequirementsPackage.USE_CASE__EXTENSION_POINT);

 		}

 		return extensionPoint;

@@ -185,17 +198,18 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case RequirementsPackage.USE_CASE__INCLUDE:

-				return ((InternalEList<?>)getInclude()).basicRemove(otherEnd, msgs);

-			case RequirementsPackage.USE_CASE__EXTEND:

-				return ((InternalEList<?>)getExtend()).basicRemove(otherEnd, msgs);

-			case RequirementsPackage.USE_CASE__EXTENSION_POINT:

-				return ((InternalEList<?>)getExtensionPoint()).basicRemove(otherEnd, msgs);

+		switch(featureID) {

+		case RequirementsPackage.USE_CASE__INCLUDE:

+			return ((InternalEList<?>)getInclude()).basicRemove(otherEnd, msgs);

+		case RequirementsPackage.USE_CASE__EXTEND:

+			return ((InternalEList<?>)getExtend()).basicRemove(otherEnd, msgs);

+		case RequirementsPackage.USE_CASE__EXTENSION_POINT:

+			return ((InternalEList<?>)getExtensionPoint()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -203,20 +217,22 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case RequirementsPackage.USE_CASE__BASE_USE_CASE:

-				if (resolve) return getBase_UseCase();

-				return basicGetBase_UseCase();

-			case RequirementsPackage.USE_CASE__INCLUDE:

-				return getInclude();

-			case RequirementsPackage.USE_CASE__EXTEND:

-				return getExtend();

-			case RequirementsPackage.USE_CASE__EXTENSION_POINT:

-				return getExtensionPoint();

+		switch(featureID) {

+		case RequirementsPackage.USE_CASE__BASE_USE_CASE:

+			if(resolve)

+				return getBase_UseCase();

+			return basicGetBase_UseCase();

+		case RequirementsPackage.USE_CASE__INCLUDE:

+			return getInclude();

+		case RequirementsPackage.USE_CASE__EXTEND:

+			return getExtend();

+		case RequirementsPackage.USE_CASE__EXTENSION_POINT:

+			return getExtensionPoint();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -224,27 +240,28 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case RequirementsPackage.USE_CASE__BASE_USE_CASE:

-				setBase_UseCase((org.eclipse.uml2.uml.UseCase)newValue);

-				return;

-			case RequirementsPackage.USE_CASE__INCLUDE:

-				getInclude().clear();

-				getInclude().addAll((Collection<? extends Include>)newValue);

-				return;

-			case RequirementsPackage.USE_CASE__EXTEND:

-				getExtend().clear();

-				getExtend().addAll((Collection<? extends Extend>)newValue);

-				return;

-			case RequirementsPackage.USE_CASE__EXTENSION_POINT:

-				getExtensionPoint().clear();

-				getExtensionPoint().addAll((Collection<? extends ExtensionPoint>)newValue);

-				return;

+		switch(featureID) {

+		case RequirementsPackage.USE_CASE__BASE_USE_CASE:

+			setBase_UseCase((org.eclipse.uml2.uml.UseCase)newValue);

+			return;

+		case RequirementsPackage.USE_CASE__INCLUDE:

+			getInclude().clear();

+			getInclude().addAll((Collection<? extends Include>)newValue);

+			return;

+		case RequirementsPackage.USE_CASE__EXTEND:

+			getExtend().clear();

+			getExtend().addAll((Collection<? extends Extend>)newValue);

+			return;

+		case RequirementsPackage.USE_CASE__EXTENSION_POINT:

+			getExtensionPoint().clear();

+			getExtensionPoint().addAll((Collection<? extends ExtensionPoint>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -252,23 +269,24 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.USE_CASE__BASE_USE_CASE:

-				setBase_UseCase((org.eclipse.uml2.uml.UseCase)null);

-				return;

-			case RequirementsPackage.USE_CASE__INCLUDE:

-				getInclude().clear();

-				return;

-			case RequirementsPackage.USE_CASE__EXTEND:

-				getExtend().clear();

-				return;

-			case RequirementsPackage.USE_CASE__EXTENSION_POINT:

-				getExtensionPoint().clear();

-				return;

+		switch(featureID) {

+		case RequirementsPackage.USE_CASE__BASE_USE_CASE:

+			setBase_UseCase((org.eclipse.uml2.uml.UseCase)null);

+			return;

+		case RequirementsPackage.USE_CASE__INCLUDE:

+			getInclude().clear();

+			return;

+		case RequirementsPackage.USE_CASE__EXTEND:

+			getExtend().clear();

+			return;

+		case RequirementsPackage.USE_CASE__EXTENSION_POINT:

+			getExtensionPoint().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -276,19 +294,20 @@ public class UseCaseImpl extends TraceableSpecificationImpl implements UseCase {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case RequirementsPackage.USE_CASE__BASE_USE_CASE:

-				return base_UseCase != null;

-			case RequirementsPackage.USE_CASE__INCLUDE:

-				return include != null && !include.isEmpty();

-			case RequirementsPackage.USE_CASE__EXTEND:

-				return extend != null && !extend.isEmpty();

-			case RequirementsPackage.USE_CASE__EXTENSION_POINT:

-				return extensionPoint != null && !extensionPoint.isEmpty();

+		switch(featureID) {

+		case RequirementsPackage.USE_CASE__BASE_USE_CASE:

+			return base_UseCase != null;

+		case RequirementsPackage.USE_CASE__INCLUDE:

+			return include != null && !include.isEmpty();

+		case RequirementsPackage.USE_CASE__EXTEND:

+			return extend != null && !extend.isEmpty();

+		case RequirementsPackage.USE_CASE__EXTENSION_POINT:

+			return extensionPoint != null && !extensionPoint.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsAdapterFactory.java
index c7f07718513..e2a90ce89be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsAdapterFactory.java
@@ -45,12 +45,12 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship;
 import org.eclipse.papyrus.eastadl.requirements.Satisfy;

 import org.eclipse.papyrus.eastadl.requirements.UseCase;

 import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.uml2.uml.profile.l2.Trace;

 

 

 /**

  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage

  * @generated

  */

@@ -59,6 +59,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static RequirementsPackage modelPackage;

@@ -67,138 +68,170 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected RequirementsSwitch<Adapter> modelSwitch = new RequirementsSwitch<Adapter>() {

-			@Override

-			public Adapter caseQualityRequirement(QualityRequirement object) {

-				return createQualityRequirementAdapter();

-			}

-			@Override

-			public Adapter caseRequirement(Requirement object) {

-				return createRequirementAdapter();

-			}

-			@Override

-			public Adapter caseRequirementSpecificationObject(RequirementSpecificationObject object) {

-				return createRequirementSpecificationObjectAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsContainer(RequirementsContainer object) {

-				return createRequirementsContainerAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsRelatedInformation(RequirementsRelatedInformation object) {

-				return createRequirementsRelatedInformationAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsRelationship(RequirementsRelationship object) {

-				return createRequirementsRelationshipAdapter();

-			}

-			@Override

-			public Adapter caseSatisfy(Satisfy object) {

-				return createSatisfyAdapter();

-			}

-			@Override

-			public Adapter caseUseCase(UseCase object) {

-				return createUseCaseAdapter();

-			}

-			@Override

-			public Adapter caseInclude(Include object) {

-				return createIncludeAdapter();

-			}

-			@Override

-			public Adapter caseExtend(Extend object) {

-				return createExtendAdapter();

-			}

-			@Override

-			public Adapter caseExtensionPoint(ExtensionPoint object) {

-				return createExtensionPointAdapter();

-			}

-			@Override

-			public Adapter caseRedefinableElement(RedefinableElement object) {

-				return createRedefinableElementAdapter();

-			}

-			@Override

-			public Adapter caseRefine(Refine object) {

-				return createRefineAdapter();

-			}

-			@Override

-			public Adapter caseDeriveRequirement(DeriveRequirement object) {

-				return createDeriveRequirementAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsRelationGroup(RequirementsRelationGroup object) {

-				return createRequirementsRelationGroupAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsLink(RequirementsLink object) {

-				return createRequirementsLinkAdapter();

-			}

-			@Override

-			public Adapter caseRequirementsModel(RequirementsModel object) {

-				return createRequirementsModelAdapter();

-			}

-			@Override

-			public Adapter caseOperationalSituation(OperationalSituation object) {

-				return createOperationalSituationAdapter();

-			}

-			@Override

-			public Adapter caseActor(Actor object) {

-				return createActorAdapter();

-			}

-			@Override

-			public Adapter caseRequirements_Requirement(org.eclipse.papyrus.sysml.requirements.Requirement object) {

-				return createRequirements_RequirementAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseEAPackageableElement(EAPackageableElement object) {

-				return createEAPackageableElementAdapter();

-			}

-			@Override

-			public Adapter caseTraceableSpecification(TraceableSpecification object) {

-				return createTraceableSpecificationAdapter();

-			}

-			@Override

-			public Adapter caseRelationship(Relationship object) {

-				return createRelationshipAdapter();

-			}

-			@Override

-			public Adapter caseTrace(Trace object) {

-				return createTraceAdapter();

-			}

-			@Override

-			public Adapter caseRequirements_Satisfy(org.eclipse.papyrus.sysml.requirements.Satisfy object) {

-				return createRequirements_SatisfyAdapter();

-			}

-			@Override

-			public Adapter caseL2_Refine(org.eclipse.uml2.uml.profile.l2.Refine object) {

-				return createL2_RefineAdapter();

-			}

-			@Override

-			public Adapter caseDeriveReqt(DeriveReqt object) {

-				return createDeriveReqtAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseQualityRequirement(QualityRequirement object) {

+			return createQualityRequirementAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirement(Requirement object) {

+			return createRequirementAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementSpecificationObject(RequirementSpecificationObject object) {

+			return createRequirementSpecificationObjectAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsContainer(RequirementsContainer object) {

+			return createRequirementsContainerAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsRelatedInformation(RequirementsRelatedInformation object) {

+			return createRequirementsRelatedInformationAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsRelationship(RequirementsRelationship object) {

+			return createRequirementsRelationshipAdapter();

+		}

+

+		@Override

+		public Adapter caseSatisfy(Satisfy object) {

+			return createSatisfyAdapter();

+		}

+

+		@Override

+		public Adapter caseUseCase(UseCase object) {

+			return createUseCaseAdapter();

+		}

+

+		@Override

+		public Adapter caseInclude(Include object) {

+			return createIncludeAdapter();

+		}

+

+		@Override

+		public Adapter caseExtend(Extend object) {

+			return createExtendAdapter();

+		}

+

+		@Override

+		public Adapter caseExtensionPoint(ExtensionPoint object) {

+			return createExtensionPointAdapter();

+		}

+

+		@Override

+		public Adapter caseRedefinableElement(RedefinableElement object) {

+			return createRedefinableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseRefine(Refine object) {

+			return createRefineAdapter();

+		}

+

+		@Override

+		public Adapter caseDeriveRequirement(DeriveRequirement object) {

+			return createDeriveRequirementAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsRelationGroup(RequirementsRelationGroup object) {

+			return createRequirementsRelationGroupAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsLink(RequirementsLink object) {

+			return createRequirementsLinkAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirementsModel(RequirementsModel object) {

+			return createRequirementsModelAdapter();

+		}

+

+		@Override

+		public Adapter caseOperationalSituation(OperationalSituation object) {

+			return createOperationalSituationAdapter();

+		}

+

+		@Override

+		public Adapter caseActor(Actor object) {

+			return createActorAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirements_Requirement(org.eclipse.papyrus.sysml.requirements.Requirement object) {

+			return createRequirements_RequirementAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseEAPackageableElement(EAPackageableElement object) {

+			return createEAPackageableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseTraceableSpecification(TraceableSpecification object) {

+			return createTraceableSpecificationAdapter();

+		}

+

+		@Override

+		public Adapter caseRelationship(Relationship object) {

+			return createRelationshipAdapter();

+		}

+

+		@Override

+		public Adapter caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {

+			return createTraceAdapter();

+		}

+

+		@Override

+		public Adapter caseRequirements_Satisfy(org.eclipse.papyrus.sysml.requirements.Satisfy object) {

+			return createRequirements_SatisfyAdapter();

+		}

+

+		@Override

+		public Adapter caseStandard_Refine(org.eclipse.uml2.uml.profile.standard.Refine object) {

+			return createStandard_RefineAdapter();

+		}

+

+		@Override

+		public Adapter caseDeriveReqt(DeriveReqt object) {

+			return createDeriveReqtAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = RequirementsPackage.eINSTANCE;

 		}

 	}

@@ -206,7 +239,9 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -221,6 +256,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -235,6 +271,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.DeriveReqt

 	 * @generated

@@ -249,6 +286,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.DeriveRequirement

 	 * @generated

@@ -261,6 +299,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -269,11 +308,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation <em>Operational Situation</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.OperationalSituation

+	 * <em>Operational Situation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.OperationalSituation

 	 * @generated

@@ -288,6 +329,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Actor

 	 * @generated

@@ -297,10 +339,12 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement <em>Quality Requirement</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.QualityRequirement <em>Quality Requirement</em>}

+	 * '.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.QualityRequirement

 	 * @generated

@@ -315,6 +359,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Refine

 	 * @generated

@@ -329,6 +374,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship

 	 * @generated

@@ -343,6 +389,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Requirement

 	 * @generated

@@ -357,6 +404,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Requirement

 	 * @generated

@@ -371,6 +419,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -380,11 +429,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

+	 * <em>EA Packageable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

 	 * @generated

@@ -399,6 +450,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.requirements.Satisfy

 	 * @generated

@@ -408,16 +460,17 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.l2.Refine <em>Refine</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.standard.Refine <em>Refine</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.uml2.uml.profile.l2.Refine

+	 * @see org.eclipse.uml2.uml.profile.standard.Refine

 	 * @generated

 	 */

-	public Adapter createL2_RefineAdapter() {

+	public Adapter createStandard_RefineAdapter() {

 		return null;

 	}

 

@@ -427,6 +480,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsContainer

 	 * @generated

@@ -441,6 +495,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsLink

 	 * @generated

@@ -455,6 +510,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsModel

 	 * @generated

@@ -464,11 +520,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject <em>Requirement Specification Object</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject

+	 * <em>Requirement Specification Object</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementSpecificationObject

 	 * @generated

@@ -478,11 +536,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation <em>Related Information</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation

+	 * <em>Related Information</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelatedInformation

 	 * @generated

@@ -492,11 +552,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup <em>Relation Group</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup

+	 * <em>Relation Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationGroup

 	 * @generated

@@ -511,6 +573,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship

 	 * @generated

@@ -525,6 +588,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Satisfy

 	 * @generated

@@ -539,6 +603,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.UseCase

 	 * @generated

@@ -553,6 +618,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Include

 	 * @generated

@@ -567,6 +633,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.Extend

 	 * @generated

@@ -581,6 +648,7 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.ExtensionPoint

 	 * @generated

@@ -590,11 +658,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement <em>Redefinable Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.RedefinableElement <em>Redefinable Element</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.requirements.RedefinableElement

 	 * @generated

@@ -604,11 +674,13 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

+	 * <em>Traceable Specification</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

 	 * @generated

@@ -618,13 +690,14 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.l2.Trace <em>Trace</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.standard.Trace <em>Trace</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

-	 * @see org.eclipse.uml2.uml.profile.l2.Trace

+	 * @see org.eclipse.uml2.uml.profile.standard.Trace

 	 * @generated

 	 */

 	public Adapter createTraceAdapter() {

@@ -636,15 +709,16 @@ public class RequirementsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceFactoryImpl.java
index 46e1613e05b..8b839dfafa4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.util.RequirementsResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class RequirementsResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class RequirementsResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceImpl.java
index 500cbd7f233..1da34d77629 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.util.RequirementsResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class RequirementsResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public RequirementsResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsSwitch.java
index 27461ec3820..840e68feb50 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsSwitch.java
@@ -44,7 +44,6 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship;
 import org.eclipse.papyrus.eastadl.requirements.Satisfy;

 import org.eclipse.papyrus.eastadl.requirements.UseCase;

 import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.uml2.uml.profile.l2.Trace;

 

 

 /**

@@ -53,6 +52,7 @@ import org.eclipse.uml2.uml.profile.l2.Trace;
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.requirements.RequirementsPackage

  * @generated

  */

@@ -61,6 +61,7 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static RequirementsPackage modelPackage;

@@ -68,10 +69,11 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsSwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = RequirementsPackage.eINSTANCE;

 		}

 	}

@@ -80,6 +82,7 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -95,7 +98,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -110,7 +115,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Derive Reqt</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -125,7 +132,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Derive Requirement</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -140,7 +149,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Operational Situation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -155,7 +166,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Actor</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -168,7 +181,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Quality Requirement</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Quality Requirement</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -183,7 +198,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Refine</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -198,7 +215,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -208,12 +227,31 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Trace</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Trace</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Requirement</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Requirement</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -228,7 +266,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Requirement</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -243,7 +283,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -258,7 +300,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -273,7 +317,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Satisfy</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -288,12 +334,14 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Refine</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseL2_Refine(org.eclipse.uml2.uml.profile.l2.Refine object) {

+	public T caseStandard_Refine(org.eclipse.uml2.uml.profile.standard.Refine object) {

 		return null;

 	}

 

@@ -303,7 +351,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Container</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -318,7 +368,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Link</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -333,7 +385,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Model</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -348,7 +402,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Requirement Specification Object</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -363,7 +419,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Related Information</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -378,7 +436,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Relation Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -393,7 +453,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -408,7 +470,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Satisfy</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -423,7 +487,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Use Case</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -438,7 +504,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Include</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -453,7 +521,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Extend</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -468,7 +538,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Extension Point</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -483,7 +555,9 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Redefinable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -493,27 +567,14 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Trace</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Trace</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTrace(Trace object) {

-		return null;

-	}

-

-	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -541,186 +602,285 @@ public class RequirementsSwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case RequirementsPackage.QUALITY_REQUIREMENT: {

-				QualityRequirement qualityRequirement = (QualityRequirement)theEObject;

-				T result = caseQualityRequirement(qualityRequirement);

-				if (result == null) result = caseRequirement(qualityRequirement);

-				if (result == null) result = caseRequirements_Requirement(qualityRequirement);

-				if (result == null) result = caseRequirementSpecificationObject(qualityRequirement);

-				if (result == null) result = caseTraceableSpecification(qualityRequirement);

-				if (result == null) result = caseEAPackageableElement(qualityRequirement);

-				if (result == null) result = caseEAElement(qualityRequirement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENT: {

-				Requirement requirement = (Requirement)theEObject;

-				T result = caseRequirement(requirement);

-				if (result == null) result = caseRequirements_Requirement(requirement);

-				if (result == null) result = caseRequirementSpecificationObject(requirement);

-				if (result == null) result = caseTraceableSpecification(requirement);

-				if (result == null) result = caseEAPackageableElement(requirement);

-				if (result == null) result = caseEAElement(requirement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT: {

-				RequirementSpecificationObject requirementSpecificationObject = (RequirementSpecificationObject)theEObject;

-				T result = caseRequirementSpecificationObject(requirementSpecificationObject);

-				if (result == null) result = caseTraceableSpecification(requirementSpecificationObject);

-				if (result == null) result = caseEAPackageableElement(requirementSpecificationObject);

-				if (result == null) result = caseEAElement(requirementSpecificationObject);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_CONTAINER: {

-				RequirementsContainer requirementsContainer = (RequirementsContainer)theEObject;

-				T result = caseRequirementsContainer(requirementsContainer);

-				if (result == null) result = caseTraceableSpecification(requirementsContainer);

-				if (result == null) result = caseEAPackageableElement(requirementsContainer);

-				if (result == null) result = caseEAElement(requirementsContainer);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION: {

-				RequirementsRelatedInformation requirementsRelatedInformation = (RequirementsRelatedInformation)theEObject;

-				T result = caseRequirementsRelatedInformation(requirementsRelatedInformation);

-				if (result == null) result = caseRequirementSpecificationObject(requirementsRelatedInformation);

-				if (result == null) result = caseTraceableSpecification(requirementsRelatedInformation);

-				if (result == null) result = caseEAPackageableElement(requirementsRelatedInformation);

-				if (result == null) result = caseEAElement(requirementsRelatedInformation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_RELATIONSHIP: {

-				RequirementsRelationship requirementsRelationship = (RequirementsRelationship)theEObject;

-				T result = caseRequirementsRelationship(requirementsRelationship);

-				if (result == null) result = caseRelationship(requirementsRelationship);

-				if (result == null) result = caseEAElement(requirementsRelationship);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.SATISFY: {

-				Satisfy satisfy = (Satisfy)theEObject;

-				T result = caseSatisfy(satisfy);

-				if (result == null) result = caseRequirementsRelationship(satisfy);

-				if (result == null) result = caseRequirements_Satisfy(satisfy);

-				if (result == null) result = caseRelationship(satisfy);

-				if (result == null) result = caseTrace(satisfy);

-				if (result == null) result = caseEAElement(satisfy);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.USE_CASE: {

-				UseCase useCase = (UseCase)theEObject;

-				T result = caseUseCase(useCase);

-				if (result == null) result = caseTraceableSpecification(useCase);

-				if (result == null) result = caseEAPackageableElement(useCase);

-				if (result == null) result = caseEAElement(useCase);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.INCLUDE: {

-				Include include = (Include)theEObject;

-				T result = caseInclude(include);

-				if (result == null) result = caseRelationship(include);

-				if (result == null) result = caseEAElement(include);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.EXTEND: {

-				Extend extend = (Extend)theEObject;

-				T result = caseExtend(extend);

-				if (result == null) result = caseRelationship(extend);

-				if (result == null) result = caseEAElement(extend);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.EXTENSION_POINT: {

-				ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;

-				T result = caseExtensionPoint(extensionPoint);

-				if (result == null) result = caseRedefinableElement(extensionPoint);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REDEFINABLE_ELEMENT: {

-				RedefinableElement redefinableElement = (RedefinableElement)theEObject;

-				T result = caseRedefinableElement(redefinableElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REFINE: {

-				Refine refine = (Refine)theEObject;

-				T result = caseRefine(refine);

-				if (result == null) result = caseRequirementsRelationship(refine);

-				if (result == null) result = caseL2_Refine(refine);

-				if (result == null) result = caseRelationship(refine);

-				if (result == null) result = caseEAElement(refine);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.DERIVE_REQUIREMENT: {

-				DeriveRequirement deriveRequirement = (DeriveRequirement)theEObject;

-				T result = caseDeriveRequirement(deriveRequirement);

-				if (result == null) result = caseRequirementsRelationship(deriveRequirement);

-				if (result == null) result = caseDeriveReqt(deriveRequirement);

-				if (result == null) result = caseRelationship(deriveRequirement);

-				if (result == null) result = caseTrace(deriveRequirement);

-				if (result == null) result = caseEAElement(deriveRequirement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_RELATION_GROUP: {

-				RequirementsRelationGroup requirementsRelationGroup = (RequirementsRelationGroup)theEObject;

-				T result = caseRequirementsRelationGroup(requirementsRelationGroup);

-				if (result == null) result = caseTraceableSpecification(requirementsRelationGroup);

-				if (result == null) result = caseEAPackageableElement(requirementsRelationGroup);

-				if (result == null) result = caseEAElement(requirementsRelationGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_LINK: {

-				RequirementsLink requirementsLink = (RequirementsLink)theEObject;

-				T result = caseRequirementsLink(requirementsLink);

-				if (result == null) result = caseRequirementsRelationship(requirementsLink);

-				if (result == null) result = caseRelationship(requirementsLink);

-				if (result == null) result = caseEAElement(requirementsLink);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.REQUIREMENTS_MODEL: {

-				RequirementsModel requirementsModel = (RequirementsModel)theEObject;

-				T result = caseRequirementsModel(requirementsModel);

-				if (result == null) result = caseContext(requirementsModel);

-				if (result == null) result = caseEAElement(requirementsModel);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.OPERATIONAL_SITUATION: {

-				OperationalSituation operationalSituation = (OperationalSituation)theEObject;

-				T result = caseOperationalSituation(operationalSituation);

-				if (result == null) result = caseTraceableSpecification(operationalSituation);

-				if (result == null) result = caseEAPackageableElement(operationalSituation);

-				if (result == null) result = caseEAElement(operationalSituation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case RequirementsPackage.ACTOR: {

-				Actor actor = (Actor)theEObject;

-				T result = caseActor(actor);

-				if (result == null) result = caseTraceableSpecification(actor);

-				if (result == null) result = caseEAPackageableElement(actor);

-				if (result == null) result = caseEAElement(actor);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case RequirementsPackage.QUALITY_REQUIREMENT:

+		{

+			QualityRequirement qualityRequirement = (QualityRequirement)theEObject;

+			T result = caseQualityRequirement(qualityRequirement);

+			if(result == null)

+				result = caseRequirement(qualityRequirement);

+			if(result == null)

+				result = caseRequirements_Requirement(qualityRequirement);

+			if(result == null)

+				result = caseRequirementSpecificationObject(qualityRequirement);

+			if(result == null)

+				result = caseTraceableSpecification(qualityRequirement);

+			if(result == null)

+				result = caseEAPackageableElement(qualityRequirement);

+			if(result == null)

+				result = caseEAElement(qualityRequirement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENT:

+		{

+			Requirement requirement = (Requirement)theEObject;

+			T result = caseRequirement(requirement);

+			if(result == null)

+				result = caseRequirements_Requirement(requirement);

+			if(result == null)

+				result = caseRequirementSpecificationObject(requirement);

+			if(result == null)

+				result = caseTraceableSpecification(requirement);

+			if(result == null)

+				result = caseEAPackageableElement(requirement);

+			if(result == null)

+				result = caseEAElement(requirement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENT_SPECIFICATION_OBJECT:

+		{

+			RequirementSpecificationObject requirementSpecificationObject = (RequirementSpecificationObject)theEObject;

+			T result = caseRequirementSpecificationObject(requirementSpecificationObject);

+			if(result == null)

+				result = caseTraceableSpecification(requirementSpecificationObject);

+			if(result == null)

+				result = caseEAPackageableElement(requirementSpecificationObject);

+			if(result == null)

+				result = caseEAElement(requirementSpecificationObject);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_CONTAINER:

+		{

+			RequirementsContainer requirementsContainer = (RequirementsContainer)theEObject;

+			T result = caseRequirementsContainer(requirementsContainer);

+			if(result == null)

+				result = caseTraceableSpecification(requirementsContainer);

+			if(result == null)

+				result = caseEAPackageableElement(requirementsContainer);

+			if(result == null)

+				result = caseEAElement(requirementsContainer);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_RELATED_INFORMATION:

+		{

+			RequirementsRelatedInformation requirementsRelatedInformation = (RequirementsRelatedInformation)theEObject;

+			T result = caseRequirementsRelatedInformation(requirementsRelatedInformation);

+			if(result == null)

+				result = caseRequirementSpecificationObject(requirementsRelatedInformation);

+			if(result == null)

+				result = caseTraceableSpecification(requirementsRelatedInformation);

+			if(result == null)

+				result = caseEAPackageableElement(requirementsRelatedInformation);

+			if(result == null)

+				result = caseEAElement(requirementsRelatedInformation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_RELATIONSHIP:

+		{

+			RequirementsRelationship requirementsRelationship = (RequirementsRelationship)theEObject;

+			T result = caseRequirementsRelationship(requirementsRelationship);

+			if(result == null)

+				result = caseRelationship(requirementsRelationship);

+			if(result == null)

+				result = caseEAElement(requirementsRelationship);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.SATISFY:

+		{

+			Satisfy satisfy = (Satisfy)theEObject;

+			T result = caseSatisfy(satisfy);

+			if(result == null)

+				result = caseRequirementsRelationship(satisfy);

+			if(result == null)

+				result = caseRequirements_Satisfy(satisfy);

+			if(result == null)

+				result = caseRelationship(satisfy);

+			if(result == null)

+				result = caseTrace(satisfy);

+			if(result == null)

+				result = caseEAElement(satisfy);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.USE_CASE:

+		{

+			UseCase useCase = (UseCase)theEObject;

+			T result = caseUseCase(useCase);

+			if(result == null)

+				result = caseTraceableSpecification(useCase);

+			if(result == null)

+				result = caseEAPackageableElement(useCase);

+			if(result == null)

+				result = caseEAElement(useCase);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.INCLUDE:

+		{

+			Include include = (Include)theEObject;

+			T result = caseInclude(include);

+			if(result == null)

+				result = caseRelationship(include);

+			if(result == null)

+				result = caseEAElement(include);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.EXTEND:

+		{

+			Extend extend = (Extend)theEObject;

+			T result = caseExtend(extend);

+			if(result == null)

+				result = caseRelationship(extend);

+			if(result == null)

+				result = caseEAElement(extend);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.EXTENSION_POINT:

+		{

+			ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;

+			T result = caseExtensionPoint(extensionPoint);

+			if(result == null)

+				result = caseRedefinableElement(extensionPoint);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REDEFINABLE_ELEMENT:

+		{

+			RedefinableElement redefinableElement = (RedefinableElement)theEObject;

+			T result = caseRedefinableElement(redefinableElement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REFINE:

+		{

+			Refine refine = (Refine)theEObject;

+			T result = caseRefine(refine);

+			if(result == null)

+				result = caseRequirementsRelationship(refine);

+			if(result == null)

+				result = caseStandard_Refine(refine);

+			if(result == null)

+				result = caseRelationship(refine);

+			if(result == null)

+				result = caseEAElement(refine);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.DERIVE_REQUIREMENT:

+		{

+			DeriveRequirement deriveRequirement = (DeriveRequirement)theEObject;

+			T result = caseDeriveRequirement(deriveRequirement);

+			if(result == null)

+				result = caseRequirementsRelationship(deriveRequirement);

+			if(result == null)

+				result = caseDeriveReqt(deriveRequirement);

+			if(result == null)

+				result = caseRelationship(deriveRequirement);

+			if(result == null)

+				result = caseTrace(deriveRequirement);

+			if(result == null)

+				result = caseEAElement(deriveRequirement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_RELATION_GROUP:

+		{

+			RequirementsRelationGroup requirementsRelationGroup = (RequirementsRelationGroup)theEObject;

+			T result = caseRequirementsRelationGroup(requirementsRelationGroup);

+			if(result == null)

+				result = caseTraceableSpecification(requirementsRelationGroup);

+			if(result == null)

+				result = caseEAPackageableElement(requirementsRelationGroup);

+			if(result == null)

+				result = caseEAElement(requirementsRelationGroup);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_LINK:

+		{

+			RequirementsLink requirementsLink = (RequirementsLink)theEObject;

+			T result = caseRequirementsLink(requirementsLink);

+			if(result == null)

+				result = caseRequirementsRelationship(requirementsLink);

+			if(result == null)

+				result = caseRelationship(requirementsLink);

+			if(result == null)

+				result = caseEAElement(requirementsLink);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.REQUIREMENTS_MODEL:

+		{

+			RequirementsModel requirementsModel = (RequirementsModel)theEObject;

+			T result = caseRequirementsModel(requirementsModel);

+			if(result == null)

+				result = caseContext(requirementsModel);

+			if(result == null)

+				result = caseEAElement(requirementsModel);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.OPERATIONAL_SITUATION:

+		{

+			OperationalSituation operationalSituation = (OperationalSituation)theEObject;

+			T result = caseOperationalSituation(operationalSituation);

+			if(result == null)

+				result = caseTraceableSpecification(operationalSituation);

+			if(result == null)

+				result = caseEAPackageableElement(operationalSituation);

+			if(result == null)

+				result = caseEAElement(operationalSituation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case RequirementsPackage.ACTOR:

+		{

+			Actor actor = (Actor)theEObject;

+			T result = caseActor(actor);

+			if(result == null)

+				result = caseTraceableSpecification(actor);

+			if(result == null)

+				result = caseEAPackageableElement(actor);

+			if(result == null)

+				result = caseEAElement(actor);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsXMLProcessor.java
index 9019bf789f0..444cf75ba2f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/util/RequirementsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class RequirementsXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class RequirementsXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public RequirementsXMLProcessor() {

@@ -49,7 +51,7 @@ public class RequirementsXMLProcessor extends XMLProcessor {
 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new RequirementsResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new RequirementsResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVActualOutcome.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVActualOutcome.java
index 025b688bd0f..6cd2b258e27 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVActualOutcome.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVActualOutcome.java
@@ -21,35 +21,38 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Actual Outcome</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * VVActualOutcome represents the actual output of the testing environment represented by VVTarget when triggered by the VVStimuli of the ConcreteVVProcedure which is defined by the association 'performedVVProcedure' of the containing VVLog. It should be equivalent to the VVIntendedOutcome defined by association 'intendedOutcome'
+ * VVActualOutcome represents the actual output of the testing environment represented by VVTarget when triggered by the VVStimuli of the
+ * ConcreteVVProcedure which is defined by the association 'performedVVProcedure' of the containing VVLog. It should be equivalent to the
+ * VVIntendedOutcome defined by association 'intendedOutcome'
  * 
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome <em>Intended Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome <em>Intended Outcome</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVActualOutcome()
  * @model
  * @generated
  */
 public interface VVActualOutcome extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVActualOutcome_Base_Class()
@@ -65,6 +68,7 @@ public interface VVActualOutcome extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Denotes the VVIntendedOutcome that must be matched by this actual outcome.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Intended Outcome</em>' reference.
 	 * @see #setIntendedOutcome(VVIntendedOutcome)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVActualOutcome_IntendedOutcome()
@@ -74,20 +78,26 @@ public interface VVActualOutcome extends TraceableSpecification {
 	VVIntendedOutcome getIntendedOutcome();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
 	void setBase_Class(org.eclipse.uml2.uml.Class value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome <em>Intended Outcome</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome
+	 * <em>Intended Outcome</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Intended Outcome</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Intended Outcome</em>' reference.
 	 * @see #getIntendedOutcome()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVCase.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVCase.java
index 6c8aa6f22ce..87d591513c8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVCase.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVCase.java
@@ -24,37 +24,39 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Case</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * VVCase represents a V&V effort, i.e. it specifies concrete test subjects and targets and provides stimuli and the expected outcome on a concrete technical level.
+ * VVCase represents a V&V effort, i.e. it specifies concrete test subjects and targets and provides stimuli and the expected outcome on a concrete
+ * technical level.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvCase <em>Vv Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase <em>Abstract VV Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvTarget <em>Vv Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvSubject <em>Vv Subject</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvLog <em>Vv Log</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvProcedure <em>Vv Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvCase <em>Vv Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase <em>Abstract VV Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvTarget <em>Vv Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvSubject <em>Vv Subject</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvLog <em>Vv Log</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvProcedure <em>Vv Procedure</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase()
  * @model
  * @generated
  */
 public interface VVCase extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Abstract VV Case</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abstract VV Case</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abstract VV Case</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abstract VV Case</em>' reference.
 	 * @see #setAbstractVVCase(VVCase)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_AbstractVVCase()
@@ -67,10 +69,10 @@ public interface VVCase extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_Base_Class()
@@ -84,10 +86,10 @@ public interface VVCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Case</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Case</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_VvCase()
 	 * @model ordered="false"
@@ -100,10 +102,10 @@ public interface VVCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Log</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Log</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Log</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_VvLog()
 	 * @model ordered="false"
@@ -119,6 +121,7 @@ public interface VVCase extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * The abstract VV procedures for this AbstractVVCase.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Procedure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_VvProcedure()
 	 * @model
@@ -131,10 +134,10 @@ public interface VVCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Subject</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Subject</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Subject</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_VvSubject()
 	 * @model required="true" ordered="false"
@@ -147,10 +150,10 @@ public interface VVCase extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVCase_VvTarget()
 	 * @model required="true" ordered="false"
@@ -159,20 +162,26 @@ public interface VVCase extends TraceableSpecification {
 	EList<VVTarget> getVvTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase <em>Abstract VV Case</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase
+	 * <em>Abstract VV Case</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract VV Case</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Abstract VV Case</em>' reference.
 	 * @see #getAbstractVVCase()
 	 * @generated
 	 */
 	void setAbstractVVCase(VVCase value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVIntendedOutcome.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVIntendedOutcome.java
index 381d3301b20..d275cebfdc9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVIntendedOutcome.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVIntendedOutcome.java
@@ -21,32 +21,35 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Intended Outcome</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Expected output of the testing environment represented by VVTarget when triggered by the corresponding VVStimuli of the containing ConcreteVVProcedure.
- * Since this entity only occurs on the concrete level (i.e. within the context of a ConcreteVVCase), the output must be provided in a form such that it can directly be compared to the output of the VVTarget(s) defined for the containing ConcreteVVCase.
+ * Expected output of the testing environment represented by VVTarget when triggered by the corresponding VVStimuli of the containing
+ * ConcreteVVProcedure.
+ * Since this entity only occurs on the concrete level (i.e. within the context of a ConcreteVVCase), the output must be provided in a form such that
+ * it can directly be compared to the output of the VVTarget(s) defined for the containing ConcreteVVCase.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVIntendedOutcome()
  * @model
  * @generated
  */
 public interface VVIntendedOutcome extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVIntendedOutcome_Base_Class()
@@ -56,10 +59,13 @@ public interface VVIntendedOutcome extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVLog.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVLog.java
index 3b1eaf3a69d..718d3cdce37 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVLog.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVLog.java
@@ -23,41 +23,44 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Log</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ConcreteVVCase represents the precise description of a V&V effort on a concrete technical level and thus provides all necessary information to actually perform this V&V effort. However, it does not represent the actual execution of the effort. 
+ * ConcreteVVCase represents the precise description of a V&V effort on a concrete technical level and thus provides all necessary information to
+ * actually perform this V&V effort. However, it does not represent the actual execution of the effort.
  * 
  * This is the purpose of the VVLog. Each VVLog metaclass represents a certain execution of a ConcreteVVCase.
  * 
- * For example, if the HIL test of the wiper system with a certain set of stimuli was performed on Friday afternoon and, for checkup, again on Monday, then there will be one ConcreteVVCase describing the HIL test and two VVLogs describing the test result from Friday and Monday respectively.
+ * For example, if the HIL test of the wiper system with a certain set of stimuli was performed on Friday afternoon and, for checkup, again on Monday,
+ * then there will be one ConcreteVVCase describing the HIL test and two VVLogs describing the test result from Friday and Monday respectively.
  * 
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate <em>Date</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getVvActualOutcome <em>Vv Actual Outcome</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure <em>Performed VV Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getVvActualOutcome <em>Vv Actual Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure <em>Performed VV Procedure</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVLog()
  * @model
  * @generated
  */
 public interface VVLog extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVLog_Base_Class()
@@ -73,6 +76,7 @@ public interface VVLog extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Date and time when this log was captured.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Date</em>' attribute.
 	 * @see #setDate(String)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVLog_Date()
@@ -85,6 +89,7 @@ public interface VVLog extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Performed VV Procedure</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Performed VV Procedure</em>' reference.
 	 * @see #setPerformedVVProcedure(VVProcedure)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVLog_PerformedVVProcedure()
@@ -101,6 +106,7 @@ public interface VVLog extends TraceableSpecification {
 	 * <!-- begin-model-doc -->
 	 * Set of outcome results.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Actual Outcome</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVLog_VvActualOutcome()
 	 * @model ordered="false"
@@ -109,10 +115,13 @@ public interface VVLog extends TraceableSpecification {
 	EList<VVActualOutcome> getVvActualOutcome();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -122,17 +131,22 @@ public interface VVLog extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate <em>Date</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Date</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Date</em>' attribute.
 	 * @see #getDate()
 	 * @generated
 	 */
 	void setDate(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure <em>Performed VV Procedure</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure
+	 * <em>Performed VV Procedure</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Performed VV Procedure</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Performed VV Procedure</em>' reference.
 	 * @see #getPerformedVVProcedure()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVProcedure.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVProcedure.java
index 886bf46b6eb..934beca95cb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVProcedure.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVProcedure.java
@@ -23,39 +23,43 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Procedure</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * VVProcedure represents an individual task in the context of an overall V&V effort (represented by a VVCase), which has to be performed in order to achieve that effort's overall objective. Just as is the case for VVCases, the definition of VVProcedures is separated in two levels: an abstract and a concrete level represented by the entities AbstractVVProcedure and ConcreteVVProcedure.
+ * VVProcedure represents an individual task in the context of an overall V&V effort (represented by a VVCase), which has to be performed in order to
+ * achieve that effort's overall objective. Just as is the case for VVCases, the definition of VVProcedures is separated in two levels: an abstract
+ * and a concrete level represented by the entities AbstractVVProcedure and ConcreteVVProcedure.
  * 
- * The concreteVVProcedure metaclass represents such a task on a concrete level, i.e. it is defined with a concrete testing environment in mind and provides stimuli and an expected outcome of the procedure in a form which is directly applicable to this testing environment.
+ * The concreteVVProcedure metaclass represents such a task on a concrete level, i.e. it is defined with a concrete testing environment in mind and
+ * provides stimuli and an expected outcome of the procedure in a form which is directly applicable to this testing environment.
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure <em>Abstract VV Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getConcreteVVProcedure <em>Concrete VV Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvIntendedOutcome <em>Vv Intended Outcome</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvStimuli <em>Vv Stimuli</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure <em>Abstract VV Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getConcreteVVProcedure <em>Concrete VV Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvIntendedOutcome <em>Vv Intended Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvStimuli <em>Vv Stimuli</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure()
  * @model
  * @generated
  */
 public interface VVProcedure extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Abstract VV Procedure</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Abstract VV Procedure</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Abstract VV Procedure</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Abstract VV Procedure</em>' reference.
 	 * @see #setAbstractVVProcedure(VVProcedure)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure_AbstractVVProcedure()
@@ -68,10 +72,10 @@ public interface VVProcedure extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure_Base_Class()
@@ -85,10 +89,10 @@ public interface VVProcedure extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Concrete VV Procedure</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Concrete VV Procedure</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Concrete VV Procedure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure_ConcreteVVProcedure()
 	 * @model ordered="false"
@@ -101,10 +105,11 @@ public interface VVProcedure extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Intended Outcome</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Intended Outcome</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Intended Outcome</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure_VvIntendedOutcome()
 	 * @model ordered="false"
@@ -117,10 +122,10 @@ public interface VVProcedure extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Stimuli</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Stimuli</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Stimuli</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVProcedure_VvStimuli()
 	 * @model ordered="false"
@@ -129,20 +134,26 @@ public interface VVProcedure extends TraceableSpecification {
 	EList<VVStimuli> getVvStimuli();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure <em>Abstract VV Procedure</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure
+	 * <em>Abstract VV Procedure</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract VV Procedure</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Abstract VV Procedure</em>' reference.
 	 * @see #getAbstractVVProcedure()
 	 * @generated
 	 */
 	void setAbstractVVProcedure(VVProcedure value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVStimuli.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVStimuli.java
index a77856776d9..0957d5fc114 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVStimuli.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVStimuli.java
@@ -21,36 +21,38 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Stimuli</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * VVStimuli represents the input values to the testing environment represented by VVTarget in order to perform the corresponding VVProcedure.
  * 
- * Since this entity only occurs on the concrete level (i.e. within the context of a ConcreteVVCase), the input values must be provided in a form such that they are directly applicable to the VVTarget(s) defined for the containing ConcreteVVCase.
+ * Since this entity only occurs on the concrete level (i.e. within the context of a ConcreteVVCase), the input values must be provided in a form such
+ * that they are directly applicable to the VVTarget(s) defined for the containing ConcreteVVCase.
  * 
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVStimuli()
  * @model
  * @generated
  */
 public interface VVStimuli extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVStimuli_Base_Class()
@@ -60,10 +62,13 @@ public interface VVStimuli extends TraceableSpecification {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVTarget.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVTarget.java
index c051ce3547d..f043a81106b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVTarget.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VVTarget.java
@@ -24,36 +24,39 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VV Target</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * VVTarget represents a concrete testing environment in which or on which a particular V&V activity can be performed. This can be physical hardware or it can be pure software in case of a test by way of design level simulations.
+ * VVTarget represents a concrete testing environment in which or on which a particular V&V activity can be performed. This can be physical hardware
+ * or it can be pure software in case of a test by way of design level simulations.
  * 
- * Usually, a VVTarget will be a realization of one or more elements. However, there are cases in which this is not true, for example when a VVTarget represents parts of the system's environment. Therefore the association to element has a minimum cardinality of 0.
+ * Usually, a VVTarget will be a realization of one or more elements. However, there are cases in which this is not true, for example when a VVTarget
+ * represents parts of the system's environment. Therefore the association to element has a minimum cardinality of 0.
  * 
  * VVTargets can be reused across several ConcreteVVCases.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVTarget()
  * @model
  * @generated
  */
 public interface VVTarget extends TraceableSpecification {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVTarget_Base_Class()
@@ -67,10 +70,10 @@ public interface VVTarget extends TraceableSpecification {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Element</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Element</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Element</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVVTarget_Element()
 	 * @model ordered="false"
@@ -79,10 +82,13 @@ public interface VVTarget extends TraceableSpecification {
 	EList<NamedElement> getElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationValidation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationValidation.java
index d23f1f2ee9e..33d1628d6e9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationValidation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationValidation.java
@@ -23,35 +23,36 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Verification Validation</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The collection of verification and validation elements. This collection can be done across the EAST-ADL2 abstraction levels.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVerify <em>Verify</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvCase <em>Vv Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvTarget <em>Vv Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVerify <em>Verify</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvCase <em>Vv Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvTarget <em>Vv Target</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation()
  * @model
  * @generated
  */
 public interface VerificationValidation extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation_Base_Class()
@@ -61,10 +62,13 @@ public interface VerificationValidation extends Context {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class
+	 * <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -74,10 +78,10 @@ public interface VerificationValidation extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation_Base_Package()
@@ -87,10 +91,13 @@ public interface VerificationValidation extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package
+	 * <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -101,10 +108,10 @@ public interface VerificationValidation extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Verify</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Verify</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Verify</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation_Verify()
 	 * @model ordered="false"
@@ -117,10 +124,10 @@ public interface VerificationValidation extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Case</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Case</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation_VvCase()
 	 * @model ordered="false"
@@ -133,10 +140,10 @@ public interface VerificationValidation extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Vv Target</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Vv Target</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Vv Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerificationValidation_VvTarget()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationFactory.java
index 05afadafe2f..2272e49761a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage
  * @generated
  */
 public interface VerificationvalidationFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	VerificationvalidationFactory eINSTANCE = org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Stimuli</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Stimuli</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Intended Outcome</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Intended Outcome</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Actual Outcome</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Actual Outcome</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Case</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Case</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Target</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Target</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Log</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Log</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>VV Procedure</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>VV Procedure</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>Verification Validation</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Verification Validation</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns a new object of class '<em>Verify</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Verify</em>'.
 	 * @generated
 	 */
@@ -119,6 +131,7 @@ public interface VerificationvalidationFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationPackage.java
index 35c65d25d81..6a318f47549 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/VerificationvalidationPackage.java
@@ -28,49 +28,72 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * A multitude of different verification and validation (V&V) techniques, methods and tools are applied during the development of EE-Systems. Different techniques are applicable at different abstraction levels. Also, the technique of choice depends on the properties to validate and/or verify. Furthermore, each partner in a project may develop and employ his own V&V processes and activities. Hence it is impossible to introduce in the EAST-ADL2 a way to model all the objects that can be required by all the possible V&V techniques. As a consequence, EAST-ADL2 furnishes just the means for planning, organizing and describing V&V activities on a fairly abstract level, and for defining the links between those V&V activities, the satisfied and verified requirements, and the objects modeling the system (Functional Analysis Architecture, Functional components, Logical Tasks, etc.). The common parts of all V&V techniques are described by the EAST-ADL2, which includes: the results expected from the V&V activities, the actual results which were obtained when applying the V&V techniques, how the V&V activities are constrained. Information that is specific to an individual V&V technique is not described in EAST-ADL2, but a place for storing this information is provided.
+ * A multitude of different verification and validation (V&V) techniques, methods and tools are applied during the development of EE-Systems.
+ * Different techniques are applicable at different abstraction levels. Also, the technique of choice depends on the properties to validate and/or
+ * verify. Furthermore, each partner in a project may develop and employ his own V&V processes and activities. Hence it is impossible to introduce in
+ * the EAST-ADL2 a way to model all the objects that can be required by all the possible V&V techniques. As a consequence, EAST-ADL2 furnishes just
+ * the means for planning, organizing and describing V&V activities on a fairly abstract level, and for defining the links between those V&V
+ * activities, the satisfied and verified requirements, and the objects modeling the system (Functional Analysis Architecture, Functional components,
+ * Logical Tasks, etc.). The common parts of all V&V techniques are described by the EAST-ADL2, which includes: the results expected from the V&V
+ * activities, the actual results which were obtained when applying the V&V techniques, how the V&V activities are constrained. Information that is
+ * specific to an individual V&V technique is not described in EAST-ADL2, but a place for storing this information is provided.
  * 
- * Single V&V techniques may be used only once or at several stages during an overall V&V effort. Some of them are specific to one modeling design stage; others can be applied at various design stages.
+ * Single V&V techniques may be used only once or at several stages during an overall V&V effort. Some of them are specific to one modeling design
+ * stage; others can be applied at various design stages.
  * 
- * A set of V&V techniques and activities is necessary in order to achieve a complete verification and validation of a given system. Often these techniques and activities are employed and performed by many different teams and departments, frequently even by different companies. This raises the demand for an overall planning and organization of all V&V related information.
+ * A set of V&V techniques and activities is necessary in order to achieve a complete verification and validation of a given system. Often these
+ * techniques and activities are employed and performed by many different teams and departments, frequently even by different companies. This raises
+ * the demand for an overall planning and organization of all V&V related information.
  * 
  * A very important notion of V&V support in EAST-ADL2 is the distinction of abstract and concrete V&V information:
  * 
- * (1) On the abstract level, verification and validation information is defined without referring to a concrete testing environment and without specifying stimuli and the expected outcome of a particular VVProcedure on a detailed technical level.
+ * (1) On the abstract level, verification and validation information is defined without referring to a concrete testing environment and without
+ * specifying stimuli and the expected outcome of a particular VVProcedure on a detailed technical level.
  * 
- * (2) On the concrete level, verification and validation information specifies a concrete testing environment and provides all necessary details for testing, e.g. stimuli and expected outcomes, on a concrete technical level applicable to that testing environment.
+ * (2) On the concrete level, verification and validation information specifies a concrete testing environment and provides all necessary details for
+ * testing, e.g. stimuli and expected outcomes, on a concrete technical level applicable to that testing environment.
  * 
- * In accordance to the "what vs. how" definition of requirements one could say: the abstract level defines what needs to be done to verify and validate a certain system, but not precisely how this is done. Conversely, the concrete level defines the precise technical details for particular testing environments. So all abstract VVCases and VVProcedures for a certain system together form sort of a "to-do"-list, which describes what needs to be done when actually testing the system with a concrete testing environment, but in a form applicable to all conceivable testing environments to all conceivable testing environments.
+ * In accordance to the "what vs. how" definition of requirements one could say: the abstract level defines what needs to be done to verify and
+ * validate a certain system, but not precisely how this is done. Conversely, the concrete level defines the precise technical details for particular
+ * testing environments. So all abstract VVCases and VVProcedures for a certain system together form sort of a "to-do"-list, which describes what
+ * needs to be done when actually testing the system with a concrete testing environment, but in a form applicable to all conceivable testing
+ * environments to all conceivable testing environments.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationFactory
  * @model kind="package"
  * @generated
  */
 public interface VerificationvalidationPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl <em>VV Stimuli</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl
+		 * <em>VV Stimuli</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVStimuli()
 		 * @generated
@@ -81,14 +104,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_STIMULI__BASE_CLASS = eINSTANCE.getVVStimuli_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl <em>VV Intended Outcome</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl
+		 * <em>VV Intended Outcome</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVIntendedOutcome()
 		 * @generated
@@ -99,14 +125,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_INTENDED_OUTCOME__BASE_CLASS = eINSTANCE.getVVIntendedOutcome_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl <em>VV Target</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl
+		 * <em>VV Target</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVTarget()
 		 * @generated
@@ -117,6 +146,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_TARGET__BASE_CLASS = eINSTANCE.getVVTarget_Base_Class();
@@ -125,14 +155,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_TARGET__ELEMENT = eINSTANCE.getVVTarget_Element();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl <em>VV Log</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl <em>VV Log</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVLog()
 		 * @generated
@@ -143,6 +176,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute VV_LOG__DATE = eINSTANCE.getVVLog_Date();
@@ -151,14 +185,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Performed VV Procedure</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_LOG__PERFORMED_VV_PROCEDURE = eINSTANCE.getVVLog_PerformedVVProcedure();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl <em>Verification Validation</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl
+		 * <em>Verification Validation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVerificationValidation()
 		 * @generated
@@ -169,6 +206,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFICATION_VALIDATION__BASE_CLASS = eINSTANCE.getVerificationValidation_Base_Class();
@@ -177,6 +215,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFICATION_VALIDATION__BASE_PACKAGE = eINSTANCE.getVerificationValidation_Base_Package();
@@ -185,6 +224,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Verify</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFICATION_VALIDATION__VERIFY = eINSTANCE.getVerificationValidation_Verify();
@@ -193,6 +233,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Case</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFICATION_VALIDATION__VV_CASE = eINSTANCE.getVerificationValidation_VvCase();
@@ -201,14 +242,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFICATION_VALIDATION__VV_TARGET = eINSTANCE.getVerificationValidation_VvTarget();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl <em>Verify</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl <em>Verify</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVerify()
 		 * @generated
@@ -219,6 +263,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Verified By Procedure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFY__VERIFIED_BY_PROCEDURE = eINSTANCE.getVerify_VerifiedByProcedure();
@@ -227,6 +272,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Verified By Case</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFY__VERIFIED_BY_CASE = eINSTANCE.getVerify_VerifiedByCase();
@@ -235,6 +281,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Verified Requirement</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VERIFY__VERIFIED_REQUIREMENT = eINSTANCE.getVerify_VerifiedRequirement();
@@ -243,6 +290,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Actual Outcome</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_LOG__VV_ACTUAL_OUTCOME = eINSTANCE.getVVLog_VvActualOutcome();
@@ -251,14 +299,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_LOG__BASE_CLASS = eINSTANCE.getVVLog_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl <em>VV Actual Outcome</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl
+		 * <em>VV Actual Outcome</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVActualOutcome()
 		 * @generated
@@ -269,6 +320,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_ACTUAL_OUTCOME__BASE_CLASS = eINSTANCE.getVVActualOutcome_Base_Class();
@@ -277,14 +329,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Intended Outcome</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_ACTUAL_OUTCOME__INTENDED_OUTCOME = eINSTANCE.getVVActualOutcome_IntendedOutcome();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl <em>VV Case</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl <em>VV Case</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVCase()
 		 * @generated
@@ -295,6 +350,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Procedure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__VV_PROCEDURE = eINSTANCE.getVVCase_VvProcedure();
@@ -303,6 +359,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__BASE_CLASS = eINSTANCE.getVVCase_Base_Class();
@@ -311,6 +368,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Case</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__VV_CASE = eINSTANCE.getVVCase_VvCase();
@@ -319,6 +377,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Abstract VV Case</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__ABSTRACT_VV_CASE = eINSTANCE.getVVCase_AbstractVVCase();
@@ -327,6 +386,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Target</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__VV_TARGET = eINSTANCE.getVVCase_VvTarget();
@@ -335,6 +395,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Subject</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__VV_SUBJECT = eINSTANCE.getVVCase_VvSubject();
@@ -343,14 +404,17 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Log</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_CASE__VV_LOG = eINSTANCE.getVVCase_VvLog();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl <em>VV Procedure</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl
+		 * <em>VV Procedure</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl
 		 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVProcedure()
 		 * @generated
@@ -361,6 +425,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_PROCEDURE__BASE_CLASS = eINSTANCE.getVVProcedure_Base_Class();
@@ -369,6 +434,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Abstract VV Procedure</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_PROCEDURE__ABSTRACT_VV_PROCEDURE = eINSTANCE.getVVProcedure_AbstractVVProcedure();
@@ -377,6 +443,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Concrete VV Procedure</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_PROCEDURE__CONCRETE_VV_PROCEDURE = eINSTANCE.getVVProcedure_ConcreteVVProcedure();
@@ -385,6 +452,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Intended Outcome</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_PROCEDURE__VV_INTENDED_OUTCOME = eINSTANCE.getVVProcedure_VvIntendedOutcome();
@@ -393,6 +461,7 @@ public interface VerificationvalidationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vv Stimuli</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VV_PROCEDURE__VV_STIMULI = eINSTANCE.getVVProcedure_VvStimuli();
@@ -403,6 +472,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "verificationvalidation";
@@ -411,6 +481,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Requirements/VerificationValidation/1";
@@ -419,6 +490,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "VerificationValidation";
@@ -427,14 +499,17 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	VerificationvalidationPackage eINSTANCE = org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl <em>VV Stimuli</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl <em>VV Stimuli</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVStimuli()
 	 * @generated
@@ -445,6 +520,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -454,6 +530,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -463,6 +540,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -472,6 +550,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -481,6 +560,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -490,6 +570,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -499,15 +580,18 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Stimuli</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VV_STIMULI_FEATURE_COUNT = ElementsPackage.TRACEABLE_SPECIFICATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl <em>VV Intended Outcome</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl
+	 * <em>VV Intended Outcome</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVIntendedOutcome()
 	 * @generated
@@ -518,6 +602,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -527,6 +612,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -536,6 +622,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -545,6 +632,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -554,6 +642,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -563,6 +652,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -572,15 +662,18 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Intended Outcome</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VV_INTENDED_OUTCOME_FEATURE_COUNT = ElementsPackage.TRACEABLE_SPECIFICATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl <em>VV Target</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl <em>VV Target</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVTarget()
 	 * @generated
@@ -591,6 +684,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl <em>VV Log</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVLog()
 	 * @generated
@@ -598,9 +692,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	int VV_LOG = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl <em>VV Actual Outcome</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl
+	 * <em>VV Actual Outcome</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVActualOutcome()
 	 * @generated
@@ -608,9 +704,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	int VV_ACTUAL_OUTCOME = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl <em>Verification Validation</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl
+	 * <em>Verification Validation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVerificationValidation()
 	 * @generated
@@ -621,6 +719,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -630,6 +729,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -639,6 +739,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -648,6 +749,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -657,6 +759,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -666,6 +769,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -675,6 +779,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Intended Outcome</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -684,6 +789,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Actual Outcome</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -693,6 +799,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl <em>VV Case</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVCase()
 	 * @generated
@@ -703,6 +810,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -712,6 +820,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -721,6 +830,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -730,6 +840,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -739,6 +850,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -748,6 +860,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -757,6 +870,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Case</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -766,6 +880,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Abstract VV Case</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -775,6 +890,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -784,6 +900,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Subject</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -793,6 +910,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Log</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -802,6 +920,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Procedure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -811,15 +930,18 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Case</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VV_CASE_FEATURE_COUNT = ElementsPackage.TRACEABLE_SPECIFICATION_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl <em>VV Procedure</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl <em>VV Procedure</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVVProcedure()
 	 * @generated
@@ -830,6 +952,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -839,6 +962,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -848,6 +972,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -857,6 +982,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -866,6 +992,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -875,6 +1002,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -884,6 +1012,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -893,6 +1022,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Target</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -902,6 +1032,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -911,6 +1042,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -920,6 +1052,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -929,6 +1062,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -938,6 +1072,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -947,6 +1082,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Date</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -956,6 +1092,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Actual Outcome</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -965,6 +1102,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -974,6 +1112,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Performed VV Procedure</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -983,6 +1122,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Log</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -992,6 +1132,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1001,6 +1142,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1010,6 +1152,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1019,6 +1162,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1028,6 +1172,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1037,6 +1182,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1046,6 +1192,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Abstract VV Procedure</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1055,6 +1202,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Concrete VV Procedure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1064,6 +1212,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Intended Outcome</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1073,6 +1222,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Stimuli</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1082,6 +1232,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>VV Procedure</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1091,6 +1242,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1100,6 +1252,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1109,6 +1262,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1118,6 +1272,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1127,6 +1282,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1136,6 +1292,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1145,6 +1302,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1154,6 +1312,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Verify</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1163,6 +1322,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Case</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1172,6 +1332,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Vv Target</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1181,6 +1342,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>Verification Validation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1190,6 +1352,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl <em>Verify</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationvalidationPackageImpl#getVerify()
 	 * @generated
@@ -1200,6 +1363,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1209,6 +1373,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1218,6 +1383,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1227,6 +1393,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1236,6 +1403,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1245,6 +1413,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Verified By Procedure</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1254,6 +1423,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Verified By Case</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1263,6 +1433,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The feature id for the '<em><b>Verified Requirement</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1272,6 +1443,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * The number of structural features of the '<em>Verify</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1281,6 +1453,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli <em>VV Stimuli</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Stimuli</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli
 	 * @generated
@@ -1288,9 +1461,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVStimuli();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli#getBase_Class()
 	 * @see #getVVStimuli()
@@ -1299,9 +1474,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVStimuli_Base_Class();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome <em>VV Intended Outcome</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome
+	 * <em>VV Intended Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Intended Outcome</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome
 	 * @generated
@@ -1309,9 +1486,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVIntendedOutcome();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome#getBase_Class()
 	 * @see #getVVIntendedOutcome()
@@ -1320,9 +1499,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVIntendedOutcome_Base_Class();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome <em>VV Actual Outcome</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome
+	 * <em>VV Actual Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Actual Outcome</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome
 	 * @generated
@@ -1330,9 +1511,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVActualOutcome();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getBase_Class()
 	 * @see #getVVActualOutcome()
@@ -1341,9 +1524,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVActualOutcome_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome <em>Intended Outcome</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome <em>Intended Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Intended Outcome</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome#getIntendedOutcome()
 	 * @see #getVVActualOutcome()
@@ -1355,6 +1540,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase <em>VV Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase
 	 * @generated
@@ -1362,9 +1548,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVCase();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getBase_Class()
 	 * @see #getVVCase()
@@ -1373,9 +1561,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvCase <em>Vv Case</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvCase
+	 * <em>Vv Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvCase()
 	 * @see #getVVCase()
@@ -1384,9 +1574,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_VvCase();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase <em>Abstract VV Case</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase
+	 * <em>Abstract VV Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Abstract VV Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getAbstractVVCase()
 	 * @see #getVVCase()
@@ -1395,9 +1587,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_AbstractVVCase();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvTarget <em>Vv Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvTarget
+	 * <em>Vv Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvTarget()
 	 * @see #getVVCase()
@@ -1406,9 +1600,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_VvTarget();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvSubject <em>Vv Subject</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvSubject
+	 * <em>Vv Subject</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Subject</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvSubject()
 	 * @see #getVVCase()
@@ -1417,9 +1613,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_VvSubject();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvLog <em>Vv Log</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvLog
+	 * <em>Vv Log</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Log</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvLog()
 	 * @see #getVVCase()
@@ -1428,9 +1626,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVCase_VvLog();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvProcedure <em>Vv Procedure</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvProcedure
+	 * <em>Vv Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase#getVvProcedure()
 	 * @see #getVVCase()
@@ -1442,6 +1642,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget <em>VV Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget
 	 * @generated
@@ -1449,9 +1650,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVTarget();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getBase_Class()
 	 * @see #getVVTarget()
@@ -1460,9 +1663,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVTarget_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getElement <em>Element</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getElement
+	 * <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Element</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget#getElement()
 	 * @see #getVVTarget()
@@ -1474,6 +1679,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog <em>VV Log</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Log</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog
 	 * @generated
@@ -1481,9 +1687,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVLog();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate <em>Date</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate <em>Date</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Date</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getDate()
 	 * @see #getVVLog()
@@ -1492,9 +1700,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EAttribute getVVLog_Date();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getVvActualOutcome <em>Vv Actual Outcome</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getVvActualOutcome <em>Vv Actual Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Actual Outcome</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getVvActualOutcome()
 	 * @see #getVVLog()
@@ -1503,9 +1713,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVLog_VvActualOutcome();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getBase_Class()
 	 * @see #getVVLog()
@@ -1514,9 +1726,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVLog_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure <em>Performed VV Procedure</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure <em>Performed VV Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Performed VV Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog#getPerformedVVProcedure()
 	 * @see #getVVLog()
@@ -1528,6 +1742,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure <em>VV Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>VV Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure
 	 * @generated
@@ -1535,9 +1750,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVVProcedure();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getBase_Class()
 	 * @see #getVVProcedure()
@@ -1546,9 +1763,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVProcedure_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure <em>Abstract VV Procedure</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure <em>Abstract VV Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Abstract VV Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getAbstractVVProcedure()
 	 * @see #getVVProcedure()
@@ -1557,9 +1776,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVProcedure_AbstractVVProcedure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getConcreteVVProcedure <em>Concrete VV Procedure</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getConcreteVVProcedure <em>Concrete VV Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Concrete VV Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getConcreteVVProcedure()
 	 * @see #getVVProcedure()
@@ -1568,9 +1789,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVProcedure_ConcreteVVProcedure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvIntendedOutcome <em>Vv Intended Outcome</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvIntendedOutcome <em>Vv Intended Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Intended Outcome</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvIntendedOutcome()
 	 * @see #getVVProcedure()
@@ -1579,9 +1802,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVProcedure_VvIntendedOutcome();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvStimuli <em>Vv Stimuli</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvStimuli <em>Vv Stimuli</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Stimuli</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure#getVvStimuli()
 	 * @see #getVVProcedure()
@@ -1590,9 +1815,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVVProcedure_VvStimuli();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation <em>Verification Validation</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation
+	 * <em>Verification Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Verification Validation</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation
 	 * @generated
@@ -1600,9 +1827,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVerificationValidation();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Class()
 	 * @see #getVerificationValidation()
@@ -1611,9 +1840,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerificationValidation_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getBase_Package()
 	 * @see #getVerificationValidation()
@@ -1622,9 +1853,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerificationValidation_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVerify <em>Verify</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVerify <em>Verify</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Verify</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVerify()
 	 * @see #getVerificationValidation()
@@ -1633,9 +1866,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerificationValidation_Verify();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvCase <em>Vv Case</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvCase <em>Vv Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvCase()
 	 * @see #getVerificationValidation()
@@ -1644,9 +1879,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerificationValidation_VvCase();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvTarget <em>Vv Target</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvTarget <em>Vv Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Vv Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation#getVvTarget()
 	 * @see #getVerificationValidation()
@@ -1658,6 +1895,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1667,6 +1905,7 @@ public interface VerificationvalidationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify <em>Verify</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Verify</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify
 	 * @generated
@@ -1674,9 +1913,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EClass getVerify();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByCase <em>Verified By Case</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByCase <em>Verified By Case</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Verified By Case</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByCase()
 	 * @see #getVerify()
@@ -1685,9 +1926,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerify_VerifiedByCase();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByProcedure <em>Verified By Procedure</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByProcedure <em>Verified By Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Verified By Procedure</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByProcedure()
 	 * @see #getVerify()
@@ -1696,9 +1939,11 @@ public interface VerificationvalidationPackage extends EPackage {
 	EReference getVerify_VerifiedByProcedure();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedRequirement <em>Verified Requirement</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedRequirement <em>Verified Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Verified Requirement</em>'.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedRequirement()
 	 * @see #getVerify()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/Verify.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/Verify.java
index 231340f2220..24fc0324540 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/Verify.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/Verify.java
@@ -24,12 +24,15 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Verify</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Verify is a relationship metaclass, which signifies a dependency relationship between a Requirement and a VVCase, showing the relationship when a client VVCase verifies the supplier Requirement.
+ * The Verify is a relationship metaclass, which signifies a dependency relationship between a Requirement and a VVCase, showing the relationship when
+ * a client VVCase verifies the supplier Requirement.
  * 
  * Semantics:
- * The Verify metaclass signifies a refined requirement/verified by relationship between a Requirement and a VVCase, where the modification of the supplier Requirement may impact the verifying client VVCase. The Verify metaclass implies the semantics that the verifying client VVCase is not complete, without the supplier Requirement. 
+ * The Verify metaclass signifies a refined requirement/verified by relationship between a Requirement and a VVCase, where the modification of the
+ * supplier Requirement may impact the verifying client VVCase. The Verify metaclass implies the semantics that the verifying client VVCase is not
+ * complete, without the supplier Requirement.
  * 
  * Notation:
  * A Verify relationship is shown as a dashed arrow between the Requirements and VVCase.
@@ -37,21 +40,22 @@ import org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship;
  * Extension:
  * To specializes SysML::Verify, which specializes the UML stereotype Trace, which extends Dependency.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByProcedure <em>Verified By Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByCase <em>Verified By Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedRequirement <em>Verified Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByProcedure <em>Verified By Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedByCase <em>Verified By Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify#getVerifiedRequirement <em>Verified Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerify()
  * @model
  * @generated
  */
 public interface Verify extends RequirementsRelationship, org.eclipse.papyrus.sysml.requirements.Verify {
+
 	/**
 	 * Returns the value of the '<em><b>Verified By Case</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase}.
@@ -61,6 +65,7 @@ public interface Verify extends RequirementsRelationship, org.eclipse.papyrus.sy
 	 * The verification that verifies the supplier requirement(s).
 	 * {derived from UML::DirectedRelationship::source}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Verified By Case</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerify_VerifiedByCase()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -76,6 +81,7 @@ public interface Verify extends RequirementsRelationship, org.eclipse.papyrus.sy
 	 * <!-- begin-model-doc -->
 	 * The procedures used to verify the requirements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Verified By Procedure</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerify_VerifiedByProcedure()
 	 * @model ordered="false"
@@ -92,6 +98,7 @@ public interface Verify extends RequirementsRelationship, org.eclipse.papyrus.sy
 	 * The set of ADL requirements which the client VV cases verify.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Verified Requirement</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#getVerify_VerifiedRequirement()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVActualOutcomeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVActualOutcomeImpl.java
index 9f80c0cee0e..315e5a8c025 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVActualOutcomeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVActualOutcomeImpl.java
@@ -32,18 +32,20 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl#getIntendedOutcome <em>Intended Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVActualOutcomeImpl#getIntendedOutcome <em>Intended Outcome</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements VVActualOutcome {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	 * The cached value of the '{@link #getIntendedOutcome() <em>Intended Outcome</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getIntendedOutcome()
 	 * @generated
 	 * @ordered
@@ -63,6 +66,7 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVActualOutcomeImpl() {
@@ -72,6 +76,7 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -81,6 +86,7 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVIntendedOutcome basicGetIntendedOutcome() {
@@ -90,17 +96,20 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
-				if (resolve) return getIntendedOutcome();
-				return basicGetIntendedOutcome();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
+			if(resolve)
+				return getIntendedOutcome();
+			return basicGetIntendedOutcome();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -108,15 +117,16 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
-				return intendedOutcome != null;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
+			return intendedOutcome != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -124,17 +134,18 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
-				setIntendedOutcome((VVIntendedOutcome)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
+			setIntendedOutcome((VVIntendedOutcome)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -142,6 +153,7 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -152,17 +164,18 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
-				setIntendedOutcome((VVIntendedOutcome)null);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME:
+			setIntendedOutcome((VVIntendedOutcome)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -170,14 +183,15 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -187,14 +201,15 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVIntendedOutcome getIntendedOutcome() {
-		if (intendedOutcome != null && intendedOutcome.eIsProxy()) {
+		if(intendedOutcome != null && intendedOutcome.eIsProxy()) {
 			InternalEObject oldIntendedOutcome = (InternalEObject)intendedOutcome;
 			intendedOutcome = (VVIntendedOutcome)eResolveProxy(oldIntendedOutcome);
-			if (intendedOutcome != oldIntendedOutcome) {
-				if (eNotificationRequired())
+			if(intendedOutcome != oldIntendedOutcome) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME, oldIntendedOutcome, intendedOutcome));
 			}
 		}
@@ -204,24 +219,26 @@ public class VVActualOutcomeImpl extends TraceableSpecificationImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_ACTUAL_OUTCOME__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIntendedOutcome(VVIntendedOutcome newIntendedOutcome) {
 		VVIntendedOutcome oldIntendedOutcome = intendedOutcome;
 		intendedOutcome = newIntendedOutcome;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_ACTUAL_OUTCOME__INTENDED_OUTCOME, oldIntendedOutcome, intendedOutcome));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVCaseImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVCaseImpl.java
index 13c64ad2a4e..f006016ddb4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVCaseImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVCaseImpl.java
@@ -39,23 +39,25 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvCase <em>Vv Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getAbstractVVCase <em>Abstract VV Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvTarget <em>Vv Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvSubject <em>Vv Subject</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvLog <em>Vv Log</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvProcedure <em>Vv Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvCase <em>Vv Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getAbstractVVCase <em>Abstract VV Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvTarget <em>Vv Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvSubject <em>Vv Subject</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvLog <em>Vv Log</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVCaseImpl#getVvProcedure <em>Vv Procedure</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -66,6 +68,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getVvCase() <em>Vv Case</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvCase()
 	 * @generated
 	 * @ordered
@@ -76,6 +79,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getAbstractVVCase() <em>Abstract VV Case</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAbstractVVCase()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getVvTarget() <em>Vv Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvTarget()
 	 * @generated
 	 * @ordered
@@ -96,6 +101,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getVvSubject() <em>Vv Subject</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvSubject()
 	 * @generated
 	 * @ordered
@@ -106,6 +112,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getVvLog() <em>Vv Log</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvLog()
 	 * @generated
 	 * @ordered
@@ -116,6 +123,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	 * The cached value of the '{@link #getVvProcedure() <em>Vv Procedure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvProcedure()
 	 * @generated
 	 * @ordered
@@ -125,6 +133,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVCaseImpl() {
@@ -134,6 +143,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVCase basicGetAbstractVVCase() {
@@ -143,6 +153,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -152,27 +163,30 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VV_CASE__VV_CASE:
-				return getVvCase();
-			case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
-				if (resolve) return getAbstractVVCase();
-				return basicGetAbstractVVCase();
-			case VerificationvalidationPackage.VV_CASE__VV_TARGET:
-				return getVvTarget();
-			case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
-				return getVvSubject();
-			case VerificationvalidationPackage.VV_CASE__VV_LOG:
-				return getVvLog();
-			case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
-				return getVvProcedure();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VV_CASE__VV_CASE:
+			return getVvCase();
+		case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
+			if(resolve)
+				return getAbstractVVCase();
+			return basicGetAbstractVVCase();
+		case VerificationvalidationPackage.VV_CASE__VV_TARGET:
+			return getVvTarget();
+		case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
+			return getVvSubject();
+		case VerificationvalidationPackage.VV_CASE__VV_LOG:
+			return getVvLog();
+		case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
+			return getVvProcedure();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -180,25 +194,26 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VV_CASE__VV_CASE:
-				return vvCase != null && !vvCase.isEmpty();
-			case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
-				return abstractVVCase != null;
-			case VerificationvalidationPackage.VV_CASE__VV_TARGET:
-				return vvTarget != null && !vvTarget.isEmpty();
-			case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
-				return vvSubject != null && !vvSubject.isEmpty();
-			case VerificationvalidationPackage.VV_CASE__VV_LOG:
-				return vvLog != null && !vvLog.isEmpty();
-			case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
-				return vvProcedure != null && !vvProcedure.isEmpty();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VV_CASE__VV_CASE:
+			return vvCase != null && !vvCase.isEmpty();
+		case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
+			return abstractVVCase != null;
+		case VerificationvalidationPackage.VV_CASE__VV_TARGET:
+			return vvTarget != null && !vvTarget.isEmpty();
+		case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
+			return vvSubject != null && !vvSubject.isEmpty();
+		case VerificationvalidationPackage.VV_CASE__VV_LOG:
+			return vvLog != null && !vvLog.isEmpty();
+		case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
+			return vvProcedure != null && !vvProcedure.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -206,38 +221,39 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_CASE:
-				getVvCase().clear();
-				getVvCase().addAll((Collection<? extends VVCase>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
-				setAbstractVVCase((VVCase)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_TARGET:
-				getVvTarget().clear();
-				getVvTarget().addAll((Collection<? extends VVTarget>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
-				getVvSubject().clear();
-				getVvSubject().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_LOG:
-				getVvLog().clear();
-				getVvLog().addAll((Collection<? extends VVLog>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
-				getVvProcedure().clear();
-				getVvProcedure().addAll((Collection<? extends VVProcedure>)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_CASE:
+			getVvCase().clear();
+			getVvCase().addAll((Collection<? extends VVCase>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
+			setAbstractVVCase((VVCase)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_TARGET:
+			getVvTarget().clear();
+			getVvTarget().addAll((Collection<? extends VVTarget>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
+			getVvSubject().clear();
+			getVvSubject().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_LOG:
+			getVvLog().clear();
+			getVvLog().addAll((Collection<? extends VVLog>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
+			getVvProcedure().clear();
+			getVvProcedure().addAll((Collection<? extends VVProcedure>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -245,6 +261,7 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -255,32 +272,33 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_CASE:
-				getVvCase().clear();
-				return;
-			case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
-				setAbstractVVCase((VVCase)null);
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_TARGET:
-				getVvTarget().clear();
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
-				getVvSubject().clear();
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_LOG:
-				getVvLog().clear();
-				return;
-			case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
-				getVvProcedure().clear();
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_CASE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_CASE:
+			getVvCase().clear();
+			return;
+		case VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE:
+			setAbstractVVCase((VVCase)null);
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_TARGET:
+			getVvTarget().clear();
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_SUBJECT:
+			getVvSubject().clear();
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_LOG:
+			getVvLog().clear();
+			return;
+		case VerificationvalidationPackage.VV_CASE__VV_PROCEDURE:
+			getVvProcedure().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -288,14 +306,15 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVCase getAbstractVVCase() {
-		if (abstractVVCase != null && abstractVVCase.eIsProxy()) {
+		if(abstractVVCase != null && abstractVVCase.eIsProxy()) {
 			InternalEObject oldAbstractVVCase = (InternalEObject)abstractVVCase;
 			abstractVVCase = (VVCase)eResolveProxy(oldAbstractVVCase);
-			if (abstractVVCase != oldAbstractVVCase) {
-				if (eNotificationRequired())
+			if(abstractVVCase != oldAbstractVVCase) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE, oldAbstractVVCase, abstractVVCase));
 			}
 		}
@@ -305,14 +324,15 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_CASE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -322,10 +342,11 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVCase> getVvCase() {
-		if (vvCase == null) {
+		if(vvCase == null) {
 			vvCase = new EObjectResolvingEList<VVCase>(VVCase.class, this, VerificationvalidationPackage.VV_CASE__VV_CASE);
 		}
 		return vvCase;
@@ -334,10 +355,11 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVLog> getVvLog() {
-		if (vvLog == null) {
+		if(vvLog == null) {
 			vvLog = new EObjectResolvingEList<VVLog>(VVLog.class, this, VerificationvalidationPackage.VV_CASE__VV_LOG);
 		}
 		return vvLog;
@@ -346,10 +368,11 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVProcedure> getVvProcedure() {
-		if (vvProcedure == null) {
+		if(vvProcedure == null) {
 			vvProcedure = new EObjectResolvingEList<VVProcedure>(VVProcedure.class, this, VerificationvalidationPackage.VV_CASE__VV_PROCEDURE);
 		}
 		return vvProcedure;
@@ -358,10 +381,11 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getVvSubject() {
-		if (vvSubject == null) {
+		if(vvSubject == null) {
 			vvSubject = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, VerificationvalidationPackage.VV_CASE__VV_SUBJECT);
 		}
 		return vvSubject;
@@ -370,10 +394,11 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVTarget> getVvTarget() {
-		if (vvTarget == null) {
+		if(vvTarget == null) {
 			vvTarget = new EObjectResolvingEList<VVTarget>(VVTarget.class, this, VerificationvalidationPackage.VV_CASE__VV_TARGET);
 		}
 		return vvTarget;
@@ -382,24 +407,26 @@ public class VVCaseImpl extends TraceableSpecificationImpl implements VVCase {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAbstractVVCase(VVCase newAbstractVVCase) {
 		VVCase oldAbstractVVCase = abstractVVCase;
 		abstractVVCase = newAbstractVVCase;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_CASE__ABSTRACT_VV_CASE, oldAbstractVVCase, abstractVVCase));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_CASE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVIntendedOutcomeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVIntendedOutcomeImpl.java
index 30c5b404916..81cb7d722a1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVIntendedOutcomeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVIntendedOutcomeImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVIntendedOutcomeImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements VVIntendedOutcome {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVIntendedOutcomeImpl() {
@@ -60,6 +63,7 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -69,14 +73,16 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -155,12 +166,13 @@ public class VVIntendedOutcomeImpl extends TraceableSpecificationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_INTENDED_OUTCOME__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVLogImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVLogImpl.java
index 4c8d37b46ca..e21b5317b78 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVLogImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVLogImpl.java
@@ -37,20 +37,22 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getDate <em>Date</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getVvActualOutcome <em>Vv Actual Outcome</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getPerformedVVProcedure <em>Performed VV Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getVvActualOutcome <em>Vv Actual Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVLogImpl#getPerformedVVProcedure <em>Performed VV Procedure</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
+
 	/**
 	 * The default value of the '{@link #getDate() <em>Date</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDate()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	 * The cached value of the '{@link #getDate() <em>Date</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDate()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	 * The cached value of the '{@link #getVvActualOutcome() <em>Vv Actual Outcome</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvActualOutcome()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -91,6 +96,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	 * The cached value of the '{@link #getPerformedVVProcedure() <em>Performed VV Procedure</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPerformedVVProcedure()
 	 * @generated
 	 * @ordered
@@ -100,6 +106,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVLogImpl() {
@@ -109,6 +116,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -118,6 +126,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVProcedure basicGetPerformedVVProcedure() {
@@ -127,21 +136,24 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_LOG__DATE:
-				return getDate();
-			case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
-				return getVvActualOutcome();
-			case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
-				if (resolve) return getPerformedVVProcedure();
-				return basicGetPerformedVVProcedure();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_LOG__DATE:
+			return getDate();
+		case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
+			return getVvActualOutcome();
+		case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
+			if(resolve)
+				return getPerformedVVProcedure();
+			return basicGetPerformedVVProcedure();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -149,19 +161,20 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_LOG__DATE:
-				return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date);
-			case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
-				return vvActualOutcome != null && !vvActualOutcome.isEmpty();
-			case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
-				return performedVVProcedure != null;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_LOG__DATE:
+			return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date);
+		case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
+			return vvActualOutcome != null && !vvActualOutcome.isEmpty();
+		case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
+			return performedVVProcedure != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -169,25 +182,26 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_LOG__DATE:
-				setDate((String)newValue);
-				return;
-			case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
-				getVvActualOutcome().clear();
-				getVvActualOutcome().addAll((Collection<? extends VVActualOutcome>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
-				setPerformedVVProcedure((VVProcedure)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_LOG__DATE:
+			setDate((String)newValue);
+			return;
+		case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
+			getVvActualOutcome().clear();
+			getVvActualOutcome().addAll((Collection<? extends VVActualOutcome>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
+			setPerformedVVProcedure((VVProcedure)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -195,6 +209,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,23 +220,24 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_LOG__DATE:
-				setDate(DATE_EDEFAULT);
-				return;
-			case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
-				getVvActualOutcome().clear();
-				return;
-			case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
-				setPerformedVVProcedure((VVProcedure)null);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_LOG__DATE:
+			setDate(DATE_EDEFAULT);
+			return;
+		case VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME:
+			getVvActualOutcome().clear();
+			return;
+		case VerificationvalidationPackage.VV_LOG__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE:
+			setPerformedVVProcedure((VVProcedure)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -229,14 +245,15 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_LOG__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -246,6 +263,7 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDate() {
@@ -255,14 +273,15 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVProcedure getPerformedVVProcedure() {
-		if (performedVVProcedure != null && performedVVProcedure.eIsProxy()) {
+		if(performedVVProcedure != null && performedVVProcedure.eIsProxy()) {
 			InternalEObject oldPerformedVVProcedure = (InternalEObject)performedVVProcedure;
 			performedVVProcedure = (VVProcedure)eResolveProxy(oldPerformedVVProcedure);
-			if (performedVVProcedure != oldPerformedVVProcedure) {
-				if (eNotificationRequired())
+			if(performedVVProcedure != oldPerformedVVProcedure) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE, oldPerformedVVProcedure, performedVVProcedure));
 			}
 		}
@@ -272,10 +291,11 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVActualOutcome> getVvActualOutcome() {
-		if (vvActualOutcome == null) {
+		if(vvActualOutcome == null) {
 			vvActualOutcome = new EObjectResolvingEList<VVActualOutcome>(VVActualOutcome.class, this, VerificationvalidationPackage.VV_LOG__VV_ACTUAL_OUTCOME);
 		}
 		return vvActualOutcome;
@@ -284,47 +304,52 @@ public class VVLogImpl extends TraceableSpecificationImpl implements VVLog {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_LOG__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDate(String newDate) {
 		String oldDate = date;
 		date = newDate;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_LOG__DATE, oldDate, date));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPerformedVVProcedure(VVProcedure newPerformedVVProcedure) {
 		VVProcedure oldPerformedVVProcedure = performedVVProcedure;
 		performedVVProcedure = newPerformedVVProcedure;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_LOG__PERFORMED_VV_PROCEDURE, oldPerformedVVProcedure, performedVVProcedure));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (date: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVProcedureImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVProcedureImpl.java
index a5581ac5c1b..7c1d3a2df57 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVProcedureImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVProcedureImpl.java
@@ -37,21 +37,25 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getAbstractVVProcedure <em>Abstract VV Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getConcreteVVProcedure <em>Concrete VV Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getVvIntendedOutcome <em>Vv Intended Outcome</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getVvStimuli <em>Vv Stimuli</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getAbstractVVProcedure <em>Abstract VV Procedure
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getConcreteVVProcedure <em>Concrete VV Procedure
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getVvIntendedOutcome <em>Vv Intended Outcome</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVProcedureImpl#getVvStimuli <em>Vv Stimuli</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVProcedureImpl extends TraceableSpecificationImpl implements VVProcedure {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -62,6 +66,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	 * The cached value of the '{@link #getAbstractVVProcedure() <em>Abstract VV Procedure</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAbstractVVProcedure()
 	 * @generated
 	 * @ordered
@@ -72,6 +77,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	 * The cached value of the '{@link #getConcreteVVProcedure() <em>Concrete VV Procedure</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConcreteVVProcedure()
 	 * @generated
 	 * @ordered
@@ -82,6 +88,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	 * The cached value of the '{@link #getVvIntendedOutcome() <em>Vv Intended Outcome</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvIntendedOutcome()
 	 * @generated
 	 * @ordered
@@ -92,6 +99,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	 * The cached value of the '{@link #getVvStimuli() <em>Vv Stimuli</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvStimuli()
 	 * @generated
 	 * @ordered
@@ -101,6 +109,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVProcedureImpl() {
@@ -110,6 +119,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVProcedure basicGetAbstractVVProcedure() {
@@ -119,6 +129,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -128,23 +139,26 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
-				if (resolve) return getAbstractVVProcedure();
-				return basicGetAbstractVVProcedure();
-			case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
-				return getConcreteVVProcedure();
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
-				return getVvIntendedOutcome();
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
-				return getVvStimuli();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
+			if(resolve)
+				return getAbstractVVProcedure();
+			return basicGetAbstractVVProcedure();
+		case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
+			return getConcreteVVProcedure();
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
+			return getVvIntendedOutcome();
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
+			return getVvStimuli();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -152,21 +166,22 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
-				return abstractVVProcedure != null;
-			case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
-				return concreteVVProcedure != null && !concreteVVProcedure.isEmpty();
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
-				return vvIntendedOutcome != null && !vvIntendedOutcome.isEmpty();
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
-				return vvStimuli != null && !vvStimuli.isEmpty();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
+			return abstractVVProcedure != null;
+		case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
+			return concreteVVProcedure != null && !concreteVVProcedure.isEmpty();
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
+			return vvIntendedOutcome != null && !vvIntendedOutcome.isEmpty();
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
+			return vvStimuli != null && !vvStimuli.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -174,30 +189,31 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
-				setAbstractVVProcedure((VVProcedure)newValue);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
-				getConcreteVVProcedure().clear();
-				getConcreteVVProcedure().addAll((Collection<? extends VVProcedure>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
-				getVvIntendedOutcome().clear();
-				getVvIntendedOutcome().addAll((Collection<? extends VVIntendedOutcome>)newValue);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
-				getVvStimuli().clear();
-				getVvStimuli().addAll((Collection<? extends VVStimuli>)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
+			setAbstractVVProcedure((VVProcedure)newValue);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
+			getConcreteVVProcedure().clear();
+			getConcreteVVProcedure().addAll((Collection<? extends VVProcedure>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
+			getVvIntendedOutcome().clear();
+			getVvIntendedOutcome().addAll((Collection<? extends VVIntendedOutcome>)newValue);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
+			getVvStimuli().clear();
+			getVvStimuli().addAll((Collection<? extends VVStimuli>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -205,6 +221,7 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,26 +232,27 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
-				setAbstractVVProcedure((VVProcedure)null);
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
-				getConcreteVVProcedure().clear();
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
-				getVvIntendedOutcome().clear();
-				return;
-			case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
-				getVvStimuli().clear();
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE:
+			setAbstractVVProcedure((VVProcedure)null);
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE:
+			getConcreteVVProcedure().clear();
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME:
+			getVvIntendedOutcome().clear();
+			return;
+		case VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI:
+			getVvStimuli().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -242,14 +260,15 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVProcedure getAbstractVVProcedure() {
-		if (abstractVVProcedure != null && abstractVVProcedure.eIsProxy()) {
+		if(abstractVVProcedure != null && abstractVVProcedure.eIsProxy()) {
 			InternalEObject oldAbstractVVProcedure = (InternalEObject)abstractVVProcedure;
 			abstractVVProcedure = (VVProcedure)eResolveProxy(oldAbstractVVProcedure);
-			if (abstractVVProcedure != oldAbstractVVProcedure) {
-				if (eNotificationRequired())
+			if(abstractVVProcedure != oldAbstractVVProcedure) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE, oldAbstractVVProcedure, abstractVVProcedure));
 			}
 		}
@@ -259,14 +278,15 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -276,10 +296,11 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVProcedure> getConcreteVVProcedure() {
-		if (concreteVVProcedure == null) {
+		if(concreteVVProcedure == null) {
 			concreteVVProcedure = new EObjectResolvingEList<VVProcedure>(VVProcedure.class, this, VerificationvalidationPackage.VV_PROCEDURE__CONCRETE_VV_PROCEDURE);
 		}
 		return concreteVVProcedure;
@@ -288,10 +309,11 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVIntendedOutcome> getVvIntendedOutcome() {
-		if (vvIntendedOutcome == null) {
+		if(vvIntendedOutcome == null) {
 			vvIntendedOutcome = new EObjectResolvingEList<VVIntendedOutcome>(VVIntendedOutcome.class, this, VerificationvalidationPackage.VV_PROCEDURE__VV_INTENDED_OUTCOME);
 		}
 		return vvIntendedOutcome;
@@ -300,10 +322,11 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVStimuli> getVvStimuli() {
-		if (vvStimuli == null) {
+		if(vvStimuli == null) {
 			vvStimuli = new EObjectResolvingEList<VVStimuli>(VVStimuli.class, this, VerificationvalidationPackage.VV_PROCEDURE__VV_STIMULI);
 		}
 		return vvStimuli;
@@ -312,24 +335,26 @@ public class VVProcedureImpl extends TraceableSpecificationImpl implements VVPro
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAbstractVVProcedure(VVProcedure newAbstractVVProcedure) {
 		VVProcedure oldAbstractVVProcedure = abstractVVProcedure;
 		abstractVVProcedure = newAbstractVVProcedure;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_PROCEDURE__ABSTRACT_VV_PROCEDURE, oldAbstractVVProcedure, abstractVVProcedure));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_PROCEDURE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVStimuliImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVStimuliImpl.java
index fbcfb526564..25d330820b7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVStimuliImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVStimuliImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVStimuliImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimuli {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVStimuliImpl() {
@@ -60,6 +63,7 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -69,14 +73,16 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_STIMULI__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_STIMULI__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -155,12 +166,13 @@ public class VVStimuliImpl extends TraceableSpecificationImpl implements VVStimu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_STIMULI__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVTargetImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVTargetImpl.java
index 91adba5685c..002b9d537b8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVTargetImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VVTargetImpl.java
@@ -36,18 +36,20 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VVTargetImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -58,6 +60,7 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getElement()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VVTargetImpl() {
@@ -76,6 +80,7 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -85,16 +90,18 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VV_TARGET__ELEMENT:
-				return getElement();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VV_TARGET__ELEMENT:
+			return getElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -102,15 +109,16 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VV_TARGET__ELEMENT:
-				return element != null && !element.isEmpty();
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VV_TARGET__ELEMENT:
+			return element != null && !element.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -118,19 +126,20 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VV_TARGET__ELEMENT:
-				getElement().clear();
-				getElement().addAll((Collection<? extends NamedElement>)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VV_TARGET__ELEMENT:
+			getElement().clear();
+			getElement().addAll((Collection<? extends NamedElement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -138,6 +147,7 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -148,17 +158,18 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VV_TARGET__ELEMENT:
-				getElement().clear();
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VV_TARGET__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VV_TARGET__ELEMENT:
+			getElement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -166,14 +177,15 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VV_TARGET__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -183,10 +195,11 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getElement() {
-		if (element == null) {
+		if(element == null) {
 			element = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, VerificationvalidationPackage.VV_TARGET__ELEMENT);
 		}
 		return element;
@@ -195,12 +208,13 @@ public class VVTargetImpl extends TraceableSpecificationImpl implements VVTarget
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VV_TARGET__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationValidationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationValidationImpl.java
index 16794b2c631..a6e930b7361 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationValidationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationValidationImpl.java
@@ -39,21 +39,23 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVerify <em>Verify</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVvCase <em>Vv Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVvTarget <em>Vv Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVerify <em>Verify</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVvCase <em>Vv Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerificationValidationImpl#getVvTarget <em>Vv Target</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VerificationValidationImpl extends ContextImpl implements VerificationValidation {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	 * The cached value of the '{@link #getVerify() <em>Verify</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVerify()
 	 * @generated
 	 * @ordered
@@ -84,6 +88,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	 * The cached value of the '{@link #getVvCase() <em>Vv Case</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvCase()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	 * The cached value of the '{@link #getVvTarget() <em>Vv Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVvTarget()
 	 * @generated
 	 * @ordered
@@ -103,6 +109,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VerificationValidationImpl() {
@@ -112,23 +119,26 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
-				return getVerify();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
-				return getVvCase();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
-				return getVvTarget();
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
+			return getVerify();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
+			return getVvCase();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
+			return getVvTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -136,21 +146,22 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
-				return base_Class != null;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
-				return base_Package != null;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
-				return verify != null && !verify.isEmpty();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
-				return vvCase != null && !vvCase.isEmpty();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
-				return vvTarget != null && !vvTarget.isEmpty();
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
+			return base_Class != null;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
+			return base_Package != null;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
+			return verify != null && !verify.isEmpty();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
+			return vvCase != null && !vvCase.isEmpty();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
+			return vvTarget != null && !vvTarget.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -158,30 +169,31 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
-				getVerify().clear();
-				getVerify().addAll((Collection<? extends Verify>)newValue);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
-				getVvCase().clear();
-				getVvCase().addAll((Collection<? extends VVCase>)newValue);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
-				getVvTarget().clear();
-				getVvTarget().addAll((Collection<? extends VVTarget>)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
+			getVerify().clear();
+			getVerify().addAll((Collection<? extends Verify>)newValue);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
+			getVvCase().clear();
+			getVvCase().addAll((Collection<? extends VVCase>)newValue);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
+			getVvTarget().clear();
+			getVvTarget().addAll((Collection<? extends VVTarget>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -189,6 +201,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,14 +212,15 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -216,6 +230,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -225,26 +240,28 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -254,6 +271,7 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -263,38 +281,40 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
-				getVerify().clear();
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
-				getVvCase().clear();
-				return;
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
-				getVvTarget().clear();
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY:
+			getVerify().clear();
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE:
+			getVvCase().clear();
+			return;
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET:
+			getVvTarget().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -302,10 +322,11 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Verify> getVerify() {
-		if (verify == null) {
+		if(verify == null) {
 			verify = new EObjectResolvingEList<Verify>(Verify.class, this, VerificationvalidationPackage.VERIFICATION_VALIDATION__VERIFY);
 		}
 		return verify;
@@ -314,10 +335,11 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVCase> getVvCase() {
-		if (vvCase == null) {
+		if(vvCase == null) {
 			vvCase = new EObjectResolvingEList<VVCase>(VVCase.class, this, VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_CASE);
 		}
 		return vvCase;
@@ -326,10 +348,11 @@ public class VerificationValidationImpl extends ContextImpl implements Verificat
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVTarget> getVvTarget() {
-		if (vvTarget == null) {
+		if(vvTarget == null) {
 			vvTarget = new EObjectResolvingEList<VVTarget>(VVTarget.class, this, VerificationvalidationPackage.VERIFICATION_VALIDATION__VV_TARGET);
 		}
 		return vvTarget;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationFactoryImpl.java
index 1ea1d69e5aa..9a3576eee4a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationFactoryImpl.java
@@ -37,12 +37,15 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class VerificationvalidationFactoryImpl extends EFactoryImpl implements VerificationvalidationFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -55,16 +58,16 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static VerificationvalidationFactory init() {
 		try {
 			VerificationvalidationFactory theVerificationvalidationFactory = (VerificationvalidationFactory)EPackage.Registry.INSTANCE.getEFactory(VerificationvalidationPackage.eNS_URI);
-			if (theVerificationvalidationFactory != null) {
+			if(theVerificationvalidationFactory != null) {
 				return theVerificationvalidationFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new VerificationvalidationFactoryImpl();
@@ -74,6 +77,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationFactoryImpl() {
@@ -83,28 +87,39 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case VerificationvalidationPackage.VV_STIMULI: return createVVStimuli();
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME: return createVVIntendedOutcome();
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME: return createVVActualOutcome();
-			case VerificationvalidationPackage.VV_CASE: return createVVCase();
-			case VerificationvalidationPackage.VV_TARGET: return createVVTarget();
-			case VerificationvalidationPackage.VV_LOG: return createVVLog();
-			case VerificationvalidationPackage.VV_PROCEDURE: return createVVProcedure();
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION: return createVerificationValidation();
-			case VerificationvalidationPackage.VERIFY: return createVerify();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case VerificationvalidationPackage.VV_STIMULI:
+			return createVVStimuli();
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME:
+			return createVVIntendedOutcome();
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME:
+			return createVVActualOutcome();
+		case VerificationvalidationPackage.VV_CASE:
+			return createVVCase();
+		case VerificationvalidationPackage.VV_TARGET:
+			return createVVTarget();
+		case VerificationvalidationPackage.VV_LOG:
+			return createVVLog();
+		case VerificationvalidationPackage.VV_PROCEDURE:
+			return createVVProcedure();
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION:
+			return createVerificationValidation();
+		case VerificationvalidationPackage.VERIFY:
+			return createVerify();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVStimuli createVVStimuli() {
@@ -115,6 +130,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVIntendedOutcome createVVIntendedOutcome() {
@@ -125,6 +141,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVActualOutcome createVVActualOutcome() {
@@ -135,6 +152,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVCase createVVCase() {
@@ -145,6 +163,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVTarget createVVTarget() {
@@ -155,6 +174,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVLog createVVLog() {
@@ -165,6 +185,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VVProcedure createVVProcedure() {
@@ -175,6 +196,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationValidation createVerificationValidation() {
@@ -185,6 +207,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Verify createVerify() {
@@ -195,6 +218,7 @@ public class VerificationvalidationFactoryImpl extends EFactoryImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationPackage getVerificationvalidationPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationPackageImpl.java
index 11b0f4a0eba..d44001158f7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerificationvalidationPackageImpl.java
@@ -94,6 +94,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class VerificationvalidationPackageImpl extends EPackageImpl implements VerificationvalidationPackage {
@@ -101,6 +102,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvStimuliEClass = null;
@@ -108,6 +110,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvIntendedOutcomeEClass = null;
@@ -115,6 +118,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvTargetEClass = null;
@@ -122,6 +126,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvLogEClass = null;
@@ -129,6 +134,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass verificationValidationEClass = null;
@@ -136,6 +142,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass verifyEClass = null;
@@ -143,6 +150,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvActualOutcomeEClass = null;
@@ -150,6 +158,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvCaseEClass = null;
@@ -157,6 +166,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vvProcedureEClass = null;
@@ -164,6 +174,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -171,16 +182,18 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * 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 VerificationvalidationPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link VerificationvalidationPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static VerificationvalidationPackage init() {
-		if (isInited) return (VerificationvalidationPackage)EPackage.Registry.INSTANCE.getEPackage(VerificationvalidationPackage.eNS_URI);
+		if(isInited)
+			return (VerificationvalidationPackage)EPackage.Registry.INSTANCE.getEPackage(VerificationvalidationPackage.eNS_URI);
 
 		// Obtain or create and register package
 		VerificationvalidationPackageImpl theVerificationvalidationPackage = (VerificationvalidationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VerificationvalidationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VerificationvalidationPackageImpl());
@@ -282,7 +295,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 		// Mark meta-data to indicate it can't be changed
 		theVerificationvalidationPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(VerificationvalidationPackage.eNS_URI, theVerificationvalidationPackage);
 		return theVerificationvalidationPackage;
@@ -291,6 +304,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVStimuli() {
@@ -300,6 +314,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVStimuli_Base_Class() {
@@ -309,6 +324,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVIntendedOutcome() {
@@ -318,6 +334,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVIntendedOutcome_Base_Class() {
@@ -327,6 +344,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVActualOutcome() {
@@ -336,6 +354,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVActualOutcome_Base_Class() {
@@ -345,6 +364,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVActualOutcome_IntendedOutcome() {
@@ -354,6 +374,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVCase() {
@@ -363,6 +384,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_Base_Class() {
@@ -372,6 +394,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_VvCase() {
@@ -381,6 +404,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_AbstractVVCase() {
@@ -390,6 +414,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_VvTarget() {
@@ -399,6 +424,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_VvSubject() {
@@ -408,6 +434,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_VvLog() {
@@ -417,6 +444,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVCase_VvProcedure() {
@@ -426,6 +454,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVTarget() {
@@ -435,6 +464,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVTarget_Base_Class() {
@@ -444,6 +474,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVTarget_Element() {
@@ -453,6 +484,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVLog() {
@@ -462,6 +494,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getVVLog_Date() {
@@ -471,6 +504,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVLog_VvActualOutcome() {
@@ -480,6 +514,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVLog_Base_Class() {
@@ -489,6 +524,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVLog_PerformedVVProcedure() {
@@ -498,6 +534,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVVProcedure() {
@@ -507,6 +544,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVProcedure_Base_Class() {
@@ -516,6 +554,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVProcedure_AbstractVVProcedure() {
@@ -525,6 +564,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVProcedure_ConcreteVVProcedure() {
@@ -534,6 +574,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVProcedure_VvIntendedOutcome() {
@@ -543,6 +584,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVVProcedure_VvStimuli() {
@@ -552,6 +594,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -559,19 +602,19 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage#eNS_URI
 	 * @see #init()
@@ -582,14 +625,16 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -645,6 +690,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVerificationValidation() {
@@ -654,6 +700,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerificationValidation_Base_Class() {
@@ -663,6 +710,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerificationValidation_Base_Package() {
@@ -672,6 +720,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerificationValidation_Verify() {
@@ -681,6 +730,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerificationValidation_VvCase() {
@@ -690,6 +740,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerificationValidation_VvTarget() {
@@ -699,6 +750,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationFactory getVerificationvalidationFactory() {
@@ -708,6 +760,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVerify() {
@@ -717,6 +770,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerify_VerifiedByCase() {
@@ -726,6 +780,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerify_VerifiedByProcedure() {
@@ -735,6 +790,7 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVerify_VerifiedRequirement() {
@@ -742,14 +798,16 @@ public class VerificationvalidationPackageImpl extends EPackageImpl implements V
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerifyImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerifyImpl.java
index a74729a819d..62b88331c18 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerifyImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/impl/VerifyImpl.java
@@ -34,8 +34,7 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.profile.l2.L2Package;
-import org.eclipse.uml2.uml.profile.l2.Trace;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 
@@ -45,13 +44,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedByProcedure <em>Verified By Procedure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedByCase <em>Verified By Case</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedRequirement <em>Verified Requirement</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedByProcedure <em>Verified By Procedure</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedByCase <em>Verified By Case</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.impl.VerifyImpl#getVerifiedRequirement <em>Verified Requirement</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
@@ -59,6 +58,7 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 	/**
 	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Abstraction()
 	 * @generated
 	 * @ordered
@@ -68,6 +68,7 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 	/**
 	 * The cached value of the '{@link #getVerifiedByProcedure() <em>Verified By Procedure</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVerifiedByProcedure()
 	 * @generated
 	 * @ordered
@@ -76,6 +77,7 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VerifyImpl() {
@@ -84,6 +86,7 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction basicGetBase_Abstraction() {
@@ -92,19 +95,23 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (derivedFeatureID) {
-				case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION: return L2Package.TRACE__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(derivedFeatureID) {
+			case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
+				return StandardPackage.TRACE__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == org.eclipse.papyrus.sysml.requirements.Verify.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
+		if(baseClass == org.eclipse.papyrus.sysml.requirements.Verify.class) {
+			switch(derivedFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -112,19 +119,23 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Trace.class) {
-			switch (baseFeatureID) {
-				case L2Package.TRACE__BASE_ABSTRACTION: return VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION;
-				default: return -1;
+		if(baseClass == org.eclipse.uml2.uml.profile.standard.Trace.class) {
+			switch(baseFeatureID) {
+			case StandardPackage.TRACE__BASE_ABSTRACTION:
+				return VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == org.eclipse.papyrus.sysml.requirements.Verify.class) {
-			switch (baseFeatureID) {
-				default: return -1;
+		if(baseClass == org.eclipse.papyrus.sysml.requirements.Verify.class) {
+			switch(baseFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -132,64 +143,69 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
-				if (resolve) return getBase_Abstraction();
-				return basicGetBase_Abstraction();
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
-				return getVerifiedByProcedure();
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_CASE:
-				return getVerifiedByCase();
-			case VerificationvalidationPackage.VERIFY__VERIFIED_REQUIREMENT:
-				return getVerifiedRequirement();
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
+			if(resolve)
+				return getBase_Abstraction();
+			return basicGetBase_Abstraction();
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
+			return getVerifiedByProcedure();
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_CASE:
+			return getVerifiedByCase();
+		case VerificationvalidationPackage.VERIFY__VERIFIED_REQUIREMENT:
+			return getVerifiedRequirement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
-				return base_Abstraction != null;
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
-				return verifiedByProcedure != null && !verifiedByProcedure.isEmpty();
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_CASE:
-				return !getVerifiedByCase().isEmpty();
-			case VerificationvalidationPackage.VERIFY__VERIFIED_REQUIREMENT:
-				return !getVerifiedRequirement().isEmpty();
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
+			return base_Abstraction != null;
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
+			return verifiedByProcedure != null && !verifiedByProcedure.isEmpty();
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_CASE:
+			return !getVerifiedByCase().isEmpty();
+		case VerificationvalidationPackage.VERIFY__VERIFIED_REQUIREMENT:
+			return !getVerifiedRequirement().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)newValue);
-				return;
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
-				getVerifiedByProcedure().clear();
-				getVerifiedByProcedure().addAll((Collection<? extends VVProcedure>)newValue);
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)newValue);
+			return;
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
+			getVerifiedByProcedure().clear();
+			getVerifiedByProcedure().addAll((Collection<? extends VVProcedure>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,31 +215,33 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
-				setBase_Abstraction((Abstraction)null);
-				return;
-			case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
-				getVerifiedByProcedure().clear();
-				return;
+		switch(featureID) {
+		case VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION:
+			setBase_Abstraction((Abstraction)null);
+			return;
+		case VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE:
+			getVerifiedByProcedure().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Abstraction getBase_Abstraction() {
-		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {
+		if(base_Abstraction != null && base_Abstraction.eIsProxy()) {
 			InternalEObject oldBase_Abstraction = (InternalEObject)base_Abstraction;
 			base_Abstraction = (Abstraction)eResolveProxy(oldBase_Abstraction);
-			if (base_Abstraction != oldBase_Abstraction) {
-				if (eNotificationRequired())
+			if(base_Abstraction != oldBase_Abstraction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 			}
 		}
@@ -260,10 +278,11 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VVProcedure> getVerifiedByProcedure() {
-		if (verifiedByProcedure == null) {
+		if(verifiedByProcedure == null) {
 			verifiedByProcedure = new EObjectResolvingEList<VVProcedure>(VVProcedure.class, this, VerificationvalidationPackage.VERIFY__VERIFIED_BY_PROCEDURE);
 		}
 		return verifiedByProcedure;
@@ -299,12 +318,13 @@ public class VerifyImpl extends RequirementsRelationshipImpl implements Verify {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Abstraction(Abstraction newBase_Abstraction) {
 		Abstraction oldBase_Abstraction = base_Abstraction;
 		base_Abstraction = newBase_Abstraction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VerificationvalidationPackage.VERIFY__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationAdapterFactory.java
index 7322ed438cc..ada1c961db2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationAdapterFactory.java
@@ -35,7 +35,6 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify;
-import org.eclipse.uml2.uml.profile.l2.Trace;
 
 
 /**
@@ -43,6 +42,7 @@ import org.eclipse.uml2.uml.profile.l2.Trace;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage
  * @generated
  */
@@ -52,6 +52,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static VerificationvalidationPackage modelPackage;
@@ -60,92 +61,111 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected VerificationvalidationSwitch<Adapter> modelSwitch =
-		new VerificationvalidationSwitch<Adapter>() {
-			@Override
-			public Adapter caseVVStimuli(VVStimuli object) {
-				return createVVStimuliAdapter();
-			}
-			@Override
-			public Adapter caseVVIntendedOutcome(VVIntendedOutcome object) {
-				return createVVIntendedOutcomeAdapter();
-			}
-			@Override
-			public Adapter caseVVActualOutcome(VVActualOutcome object) {
-				return createVVActualOutcomeAdapter();
-			}
-			@Override
-			public Adapter caseVVCase(VVCase object) {
-				return createVVCaseAdapter();
-			}
-			@Override
-			public Adapter caseVVTarget(VVTarget object) {
-				return createVVTargetAdapter();
-			}
-			@Override
-			public Adapter caseVVLog(VVLog object) {
-				return createVVLogAdapter();
-			}
-			@Override
-			public Adapter caseVVProcedure(VVProcedure object) {
-				return createVVProcedureAdapter();
-			}
-			@Override
-			public Adapter caseVerificationValidation(VerificationValidation object) {
-				return createVerificationValidationAdapter();
-			}
-			@Override
-			public Adapter caseVerify(Verify object) {
-				return createVerifyAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseEAPackageableElement(EAPackageableElement object) {
-				return createEAPackageableElementAdapter();
-			}
-			@Override
-			public Adapter caseTraceableSpecification(TraceableSpecification object) {
-				return createTraceableSpecificationAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter caseRelationship(Relationship object) {
-				return createRelationshipAdapter();
-			}
-			@Override
-			public Adapter caseRequirementsRelationship(RequirementsRelationship object) {
-				return createRequirementsRelationshipAdapter();
-			}
-			@Override
-			public Adapter caseTrace(Trace object) {
-				return createTraceAdapter();
-			}
-			@Override
-			public Adapter caseRequirements_Verify(org.eclipse.papyrus.sysml.requirements.Verify object) {
-				return createRequirements_VerifyAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected VerificationvalidationSwitch<Adapter> modelSwitch = new VerificationvalidationSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseVVStimuli(VVStimuli object) {
+			return createVVStimuliAdapter();
+		}
+
+		@Override
+		public Adapter caseVVIntendedOutcome(VVIntendedOutcome object) {
+			return createVVIntendedOutcomeAdapter();
+		}
+
+		@Override
+		public Adapter caseVVActualOutcome(VVActualOutcome object) {
+			return createVVActualOutcomeAdapter();
+		}
+
+		@Override
+		public Adapter caseVVCase(VVCase object) {
+			return createVVCaseAdapter();
+		}
+
+		@Override
+		public Adapter caseVVTarget(VVTarget object) {
+			return createVVTargetAdapter();
+		}
+
+		@Override
+		public Adapter caseVVLog(VVLog object) {
+			return createVVLogAdapter();
+		}
+
+		@Override
+		public Adapter caseVVProcedure(VVProcedure object) {
+			return createVVProcedureAdapter();
+		}
+
+		@Override
+		public Adapter caseVerificationValidation(VerificationValidation object) {
+			return createVerificationValidationAdapter();
+		}
+
+		@Override
+		public Adapter caseVerify(Verify object) {
+			return createVerifyAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseEAPackageableElement(EAPackageableElement object) {
+			return createEAPackageableElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTraceableSpecification(TraceableSpecification object) {
+			return createTraceableSpecificationAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter caseRelationship(Relationship object) {
+			return createRelationshipAdapter();
+		}
+
+		@Override
+		public Adapter caseRequirementsRelationship(RequirementsRelationship object) {
+			return createRequirementsRelationshipAdapter();
+		}
+
+		@Override
+		public Adapter caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {
+			return createTraceAdapter();
+		}
+
+		@Override
+		public Adapter caseRequirements_Verify(org.eclipse.papyrus.sysml.requirements.Verify object) {
+			return createRequirements_VerifyAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = VerificationvalidationPackage.eINSTANCE;
 		}
 	}
@@ -154,7 +174,9 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -164,11 +186,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli <em>VV Stimuli</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli
+	 * <em>VV Stimuli</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVStimuli
 	 * @generated
@@ -178,11 +202,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome <em>VV Intended Outcome</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome
+	 * <em>VV Intended Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVIntendedOutcome
 	 * @generated
@@ -192,11 +218,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome <em>VV Actual Outcome</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome
+	 * <em>VV Actual Outcome</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVActualOutcome
 	 * @generated
@@ -211,6 +239,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVCase
 	 * @generated
@@ -220,11 +249,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget <em>VV Target</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget
+	 * <em>VV Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget
 	 * @generated
@@ -239,6 +270,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVLog
 	 * @generated
@@ -248,11 +280,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure <em>VV Procedure</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure
+	 * <em>VV Procedure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVProcedure
 	 * @generated
@@ -267,6 +301,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -280,6 +315,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -293,6 +329,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship
 	 * @generated
@@ -307,6 +344,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.sysml.requirements.Verify
 	 * @generated
@@ -321,6 +359,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.RequirementsRelationship
 	 * @generated
@@ -330,11 +369,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
+	 * <em>Traceable Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification
 	 * @generated
@@ -344,13 +385,14 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.l2.Trace <em>Trace</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.profile.standard.Trace <em>Trace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.uml2.uml.profile.l2.Trace
+	 * @see org.eclipse.uml2.uml.profile.standard.Trace
 	 * @generated
 	 */
 	public Adapter createTraceAdapter() {
@@ -358,11 +400,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation <em>Verification Validation</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation
+	 * <em>Verification Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation
 	 * @generated
@@ -377,6 +421,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify
 	 * @generated
@@ -391,6 +436,7 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -400,11 +446,13 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
+	 * <em>EA Packageable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement
 	 * @generated
@@ -418,15 +466,16 @@ public class VerificationvalidationAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceFactoryImpl.java
index 1a78b863465..605788903bc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.util.VerificationvalidationResourceImpl
  * @generated
  */
 public class VerificationvalidationResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class VerificationvalidationResourceFactoryImpl extends ResourceFactoryIm
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceImpl.java
index 977f338d33c..65d3a823e50 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.util.VerificationvalidationResourceFactoryImpl
  * @generated
  */
 public class VerificationvalidationResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public VerificationvalidationResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationSwitch.java
index b431a513257..1cc87c03e4c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationSwitch.java
@@ -34,7 +34,6 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VVTarget;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationValidation;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage;
 import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verify;
-import org.eclipse.uml2.uml.profile.l2.Trace;
 
 
 /**
@@ -46,6 +45,7 @@ import org.eclipse.uml2.uml.profile.l2.Trace;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.requirements.verificationvalidation.VerificationvalidationPackage
  * @generated
  */
@@ -55,6 +55,7 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static VerificationvalidationPackage modelPackage;
@@ -63,10 +64,11 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = VerificationvalidationPackage.eINSTANCE;
 		}
 	}
@@ -75,6 +77,7 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -90,7 +93,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -105,7 +110,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -120,7 +127,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Verify</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -135,7 +144,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -150,12 +161,14 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Trace</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseTrace(Trace object) {
+	public T caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {
 		return null;
 	}
 
@@ -165,7 +178,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -180,7 +195,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Verification Validation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -195,7 +212,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Verify</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -210,7 +229,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -225,7 +246,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -240,7 +263,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -254,95 +279,143 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case VerificationvalidationPackage.VV_STIMULI: {
-				VVStimuli vvStimuli = (VVStimuli)theEObject;
-				T result = caseVVStimuli(vvStimuli);
-				if (result == null) result = caseTraceableSpecification(vvStimuli);
-				if (result == null) result = caseEAPackageableElement(vvStimuli);
-				if (result == null) result = caseEAElement(vvStimuli);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_INTENDED_OUTCOME: {
-				VVIntendedOutcome vvIntendedOutcome = (VVIntendedOutcome)theEObject;
-				T result = caseVVIntendedOutcome(vvIntendedOutcome);
-				if (result == null) result = caseTraceableSpecification(vvIntendedOutcome);
-				if (result == null) result = caseEAPackageableElement(vvIntendedOutcome);
-				if (result == null) result = caseEAElement(vvIntendedOutcome);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_ACTUAL_OUTCOME: {
-				VVActualOutcome vvActualOutcome = (VVActualOutcome)theEObject;
-				T result = caseVVActualOutcome(vvActualOutcome);
-				if (result == null) result = caseTraceableSpecification(vvActualOutcome);
-				if (result == null) result = caseEAPackageableElement(vvActualOutcome);
-				if (result == null) result = caseEAElement(vvActualOutcome);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_CASE: {
-				VVCase vvCase = (VVCase)theEObject;
-				T result = caseVVCase(vvCase);
-				if (result == null) result = caseTraceableSpecification(vvCase);
-				if (result == null) result = caseEAPackageableElement(vvCase);
-				if (result == null) result = caseEAElement(vvCase);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_TARGET: {
-				VVTarget vvTarget = (VVTarget)theEObject;
-				T result = caseVVTarget(vvTarget);
-				if (result == null) result = caseTraceableSpecification(vvTarget);
-				if (result == null) result = caseEAPackageableElement(vvTarget);
-				if (result == null) result = caseEAElement(vvTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_LOG: {
-				VVLog vvLog = (VVLog)theEObject;
-				T result = caseVVLog(vvLog);
-				if (result == null) result = caseTraceableSpecification(vvLog);
-				if (result == null) result = caseEAPackageableElement(vvLog);
-				if (result == null) result = caseEAElement(vvLog);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VV_PROCEDURE: {
-				VVProcedure vvProcedure = (VVProcedure)theEObject;
-				T result = caseVVProcedure(vvProcedure);
-				if (result == null) result = caseTraceableSpecification(vvProcedure);
-				if (result == null) result = caseEAPackageableElement(vvProcedure);
-				if (result == null) result = caseEAElement(vvProcedure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VERIFICATION_VALIDATION: {
-				VerificationValidation verificationValidation = (VerificationValidation)theEObject;
-				T result = caseVerificationValidation(verificationValidation);
-				if (result == null) result = caseContext(verificationValidation);
-				if (result == null) result = caseEAElement(verificationValidation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case VerificationvalidationPackage.VERIFY: {
-				Verify verify = (Verify)theEObject;
-				T result = caseVerify(verify);
-				if (result == null) result = caseRequirementsRelationship(verify);
-				if (result == null) result = caseRequirements_Verify(verify);
-				if (result == null) result = caseRelationship(verify);
-				if (result == null) result = caseTrace(verify);
-				if (result == null) result = caseEAElement(verify);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case VerificationvalidationPackage.VV_STIMULI:
+		{
+			VVStimuli vvStimuli = (VVStimuli)theEObject;
+			T result = caseVVStimuli(vvStimuli);
+			if(result == null)
+				result = caseTraceableSpecification(vvStimuli);
+			if(result == null)
+				result = caseEAPackageableElement(vvStimuli);
+			if(result == null)
+				result = caseEAElement(vvStimuli);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_INTENDED_OUTCOME:
+		{
+			VVIntendedOutcome vvIntendedOutcome = (VVIntendedOutcome)theEObject;
+			T result = caseVVIntendedOutcome(vvIntendedOutcome);
+			if(result == null)
+				result = caseTraceableSpecification(vvIntendedOutcome);
+			if(result == null)
+				result = caseEAPackageableElement(vvIntendedOutcome);
+			if(result == null)
+				result = caseEAElement(vvIntendedOutcome);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_ACTUAL_OUTCOME:
+		{
+			VVActualOutcome vvActualOutcome = (VVActualOutcome)theEObject;
+			T result = caseVVActualOutcome(vvActualOutcome);
+			if(result == null)
+				result = caseTraceableSpecification(vvActualOutcome);
+			if(result == null)
+				result = caseEAPackageableElement(vvActualOutcome);
+			if(result == null)
+				result = caseEAElement(vvActualOutcome);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_CASE:
+		{
+			VVCase vvCase = (VVCase)theEObject;
+			T result = caseVVCase(vvCase);
+			if(result == null)
+				result = caseTraceableSpecification(vvCase);
+			if(result == null)
+				result = caseEAPackageableElement(vvCase);
+			if(result == null)
+				result = caseEAElement(vvCase);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_TARGET:
+		{
+			VVTarget vvTarget = (VVTarget)theEObject;
+			T result = caseVVTarget(vvTarget);
+			if(result == null)
+				result = caseTraceableSpecification(vvTarget);
+			if(result == null)
+				result = caseEAPackageableElement(vvTarget);
+			if(result == null)
+				result = caseEAElement(vvTarget);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_LOG:
+		{
+			VVLog vvLog = (VVLog)theEObject;
+			T result = caseVVLog(vvLog);
+			if(result == null)
+				result = caseTraceableSpecification(vvLog);
+			if(result == null)
+				result = caseEAPackageableElement(vvLog);
+			if(result == null)
+				result = caseEAElement(vvLog);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VV_PROCEDURE:
+		{
+			VVProcedure vvProcedure = (VVProcedure)theEObject;
+			T result = caseVVProcedure(vvProcedure);
+			if(result == null)
+				result = caseTraceableSpecification(vvProcedure);
+			if(result == null)
+				result = caseEAPackageableElement(vvProcedure);
+			if(result == null)
+				result = caseEAElement(vvProcedure);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VERIFICATION_VALIDATION:
+		{
+			VerificationValidation verificationValidation = (VerificationValidation)theEObject;
+			T result = caseVerificationValidation(verificationValidation);
+			if(result == null)
+				result = caseContext(verificationValidation);
+			if(result == null)
+				result = caseEAElement(verificationValidation);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case VerificationvalidationPackage.VERIFY:
+		{
+			Verify verify = (Verify)theEObject;
+			T result = caseVerify(verify);
+			if(result == null)
+				result = caseRequirementsRelationship(verify);
+			if(result == null)
+				result = caseRequirements_Verify(verify);
+			if(result == null)
+				result = caseRelationship(verify);
+			if(result == null)
+				result = caseTrace(verify);
+			if(result == null)
+				result = caseEAElement(verify);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -352,7 +425,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Stimuli</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -367,7 +442,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Intended Outcome</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -382,7 +459,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Actual Outcome</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -397,7 +476,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -412,7 +493,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Target</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -427,7 +510,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Log</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -442,7 +527,9 @@ public class VerificationvalidationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>VV Procedure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationXMLProcessor.java
index 0fddca4e4e1..61e83e37319 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/requirements/verificationvalidation/util/VerificationvalidationXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.requirements.verificationvalidation.Verificat
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class VerificationvalidationXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class VerificationvalidationXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VerificationvalidationXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		VerificationvalidationPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the VerificationvalidationResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new VerificationvalidationResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new VerificationvalidationResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructureFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructureFactory.java
index fa48847bcba..87dd36e8544 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructureFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructureFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.StructurePackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface StructureFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	StructureFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.impl.StructureFactoryImpl.init();

@@ -35,6 +37,7 @@ public interface StructureFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructurePackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructurePackage.java
index ee6a50c1888..792a871c7cb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructurePackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/StructurePackage.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.StructureFactory

  * @model kind="package"

  * @generated

@@ -43,6 +44,7 @@ public interface StructurePackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

@@ -51,6 +53,7 @@ public interface StructurePackage extends EPackage {
 		 * The meta object literal for the '<em>Dummy</em>' data type.

 		 * <!-- begin-user-doc --> <!--

 		 * end-user-doc -->

+		 * 

 		 * @see java.lang.String

 		 * @see org.eclipse.papyrus.eastadl.structure.impl.StructurePackageImpl#getDummy()

 		 * @generated

@@ -62,6 +65,7 @@ public interface StructurePackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "structure";

@@ -69,6 +73,7 @@ public interface StructurePackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/1";

@@ -76,6 +81,7 @@ public interface StructurePackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "Structure";

@@ -83,6 +89,7 @@ public interface StructurePackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	StructurePackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.impl.StructurePackageImpl.init();

@@ -91,6 +98,7 @@ public interface StructurePackage extends EPackage {
 	 * The meta object id for the '<em>Dummy</em>' data type.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @see java.lang.String

 	 * @see org.eclipse.papyrus.eastadl.structure.impl.StructurePackageImpl#getDummy()

 	 * @generated

@@ -112,6 +120,7 @@ public interface StructurePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTime.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTime.java
index 40051e04f4e..db12c6768e9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTime.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTime.java
@@ -21,39 +21,47 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Binding Time</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The motivation for attributing features and variable elements with binding times is that binding times encapsulate important information about the variability under view:
+ * The motivation for attributing features and variable elements with binding times is that binding times encapsulate important information about the
+ * variability under view:
  * 
- * Variability that must be bound (determined, decided) very early in the system development may not be visible in one single feature model but only in comparison with different feature models in the context of multi-level feature trees; late bound variability is variability providing the driver with choices for current equipment configuration.
+ * Variability that must be bound (determined, decided) very early in the system development may not be visible in one single feature model but only
+ * in comparison with different feature models in the context of multi-level feature trees; late bound variability is variability providing the driver
+ * with choices for current equipment configuration.
  * 
- * Binding times are important because they describe if the variability must be decided during system development or if the variability is determined by a customer or if the variability itself is part of the product features that are sold to the customer. Possible binding times are:
+ * Binding times are important because they describe if the variability must be decided during system development or if the variability is determined
+ * by a customer or if the variability itself is part of the product features that are sold to the customer. Possible binding times are:
  * 
- * -	SystemDesignTime
- * -	CodeGenerationTime
- * -	PreCompileTime
- * -	LinkTime
- * -	PostBuild
- * -	Runtime
+ * - SystemDesignTime
+ * - CodeGenerationTime
+ * - PreCompileTime
+ * - LinkTime
+ * - PostBuild
+ * - Runtime
  * 
- * Note that a binding time is never a particular point in time such as April 2nd, 2011, but always a certain stage in the overall development, production and shipment process as represented by the above values.
+ * Note that a binding time is never a particular point in time such as April 2nd, 2011, but always a certain stage in the overall development,
+ * production and shipment process as represented by the above values.
  * 
  * Each feature must have a binding time (association requiredBindingTime) and may have one further binding time (association actualBindingTime).
  * 
- * The required binding time describes the binding time that the feature is intended to have. But due to technical conditions it may occur that the actually realized binding time of the feature differs from the originally intended binding time. In this case one has to provide information about the actual binding time. In the rationale it must be described by what the required binding time is motivated and what the reasons are for a (different) actual binding time.
+ * The required binding time describes the binding time that the feature is intended to have. But due to technical conditions it may occur that the
+ * actually realized binding time of the feature differs from the originally intended binding time. In this case one has to provide information about
+ * the actual binding time. In the rationale it must be described by what the required binding time is motivated and what the reasons are for a
+ * (different) actual binding time.
  * 
  * Extension:
  * Class.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getBindingTime()
  * @model
  * @generated
@@ -61,9 +69,8 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 public interface BindingTime extends EAElement {
 
 	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The default value is
-	 * <code>"DEVELOPMENT"</code>. The literals are from the enumeration
-	 * {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind}. <!--
+	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The default value is <code>"DEVELOPMENT"</code>. The literals are from the
+	 * enumeration {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind}. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The kind of the binding
 	 * time, see enumeration of binding times. <!-- end-model-doc -->
 	 * 
@@ -79,7 +86,9 @@ public interface BindingTime extends EAElement {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind
 	 * @see #getKind()
 	 * @generated
@@ -90,10 +99,10 @@ public interface BindingTime extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getBindingTime_Base_Class()
@@ -106,7 +115,9 @@ public interface BindingTime extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTimeKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTimeKind.java
index 933c17d2993..079763f50b5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTimeKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/BindingTimeKind.java
@@ -22,8 +22,8 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;

 

 /**

- * <!-- begin-user-doc --> A representation of the literals of the enumeration '

- * <em><b>Binding Time Kind</b></em>', and utility methods for working with them. <!-- end-user-doc

+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Binding Time Kind</b></em>', and utility methods for working

+ * with them. <!-- end-user-doc

  * --> <!-- begin-model-doc --> The binding time kind gives the set of possible binding times.

  * 

  * Semantics: BindingTimeKind has no specific semantics. Further subclasses of BindingTimeKind will

@@ -38,6 +38,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>System Design Time</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #SYSTEM_DESIGN_TIME_VALUE

 	 * @generated

 	 * @ordered

@@ -46,6 +47,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>Code Generation Time</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #CODE_GENERATION_TIME_VALUE

 	 * @generated

 	 * @ordered

@@ -54,6 +56,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>Precompile Time</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #PRECOMPILE_TIME_VALUE

 	 * @generated

 	 * @ordered

@@ -62,6 +65,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>Link Time</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #LINK_TIME_VALUE

 	 * @generated

 	 * @ordered

@@ -70,6 +74,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>Post Build</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #POST_BUILD_VALUE

 	 * @generated

 	 * @ordered

@@ -78,6 +83,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * The '<em><b>Runtime</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #RUNTIME_VALUE

 	 * @generated

 	 * @ordered

@@ -99,6 +105,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * * ECUs and interconnecting Networks

 	 * * Designing the Communication Matrix and Data Mapping

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #SYSTEM_DESIGN_TIME

 	 * @model name="systemDesignTime"

 	 * @generated

@@ -119,6 +126,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * * The model may contain variants.

 	 * * Only code for the selected variant(s) is actually generated.

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #CODE_GENERATION_TIME

 	 * @model name="codeGenerationTime"

 	 * @generated

@@ -134,8 +142,12 @@ public enum BindingTimeKind implements Enumerator {
 	 * Variability will be bound during or immediately prior to code compilation.

 	 * 

 	 * From AUTOSAR:

-	 * This is typically the C-Preprocessor. Exclude parts of the code from the compilation process, e.g., because they are not required for the selected variant, because they are incompatible with the selected variant, because they require resources that are not present in the selected variant. Object code is only generated for the selected variant(s). The code that is excluded at this stage code will not be available at later stages.

+	 * This is typically the C-Preprocessor. Exclude parts of the code from the compilation process, e.g., because they are not required for the

+	 * selected variant, because they are incompatible with the selected variant, because they require resources that are not present in the selected

+	 * variant. Object code is only generated for the selected variant(s). The code that is excluded at this stage code will not be available at later

+	 * stages.

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #PRECOMPILE_TIME

 	 * @model name="precompileTime"

 	 * @generated

@@ -155,6 +167,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * Based on which variant(s) are selected

 	 * E.g. for modules that are delivered as object code (as opposed to those that are delivered as source code)

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #LINK_TIME

 	 * @model name="linkTime"

 	 * @generated

@@ -169,6 +182,7 @@ public enum BindingTimeKind implements Enumerator {
 	 * <!-- begin-model-doc -->

 	 * Variability will be bound at certain occasions after shipment, for example when the vehicle is in a workshop.

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #POST_BUILD

 	 * @model name="postBuild"

 	 * @generated

@@ -183,8 +197,11 @@ public enum BindingTimeKind implements Enumerator {
 	 * <!-- begin-model-doc -->

 	 * Variability will be bound by the customer after shipment by way of vehicle configuration.

 	 * 

-	 * Variability with such a late binding time can also be seen as a special functionality of the system which is not documented as variability at all. However, it is sometimes advantageous to represent such cases as variability in order to be able to seamlessly include them in the overall variability management activities.

+	 * Variability with such a late binding time can also be seen as a special functionality of the system which is not documented as variability at

+	 * all. However, it is sometimes advantageous to represent such cases as variability in order to be able to seamlessly include them in the overall

+	 * variability management activities.

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #RUNTIME

 	 * @model name="runtime"

 	 * @generated

@@ -196,16 +213,10 @@ public enum BindingTimeKind implements Enumerator {
 	 * An array of all the '<em><b>Binding Time Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	private static final BindingTimeKind[] VALUES_ARRAY = new BindingTimeKind[] {

-			SYSTEM_DESIGN_TIME,

-			CODE_GENERATION_TIME,

-			PRECOMPILE_TIME,

-			LINK_TIME,

-			POST_BUILD,

-			RUNTIME,

-		};

+	private static final BindingTimeKind[] VALUES_ARRAY = new BindingTimeKind[]{ SYSTEM_DESIGN_TIME, CODE_GENERATION_TIME, PRECOMPILE_TIME, LINK_TIME, POST_BUILD, RUNTIME, };

 

 	/**

 	 * A public read-only list of all the '<em><b>Binding Time Kind</b></em>' enumerators. <!--

@@ -218,16 +229,23 @@ public enum BindingTimeKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Binding Time Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static BindingTimeKind get(int value) {

-		switch (value) {

-			case SYSTEM_DESIGN_TIME_VALUE: return SYSTEM_DESIGN_TIME;

-			case CODE_GENERATION_TIME_VALUE: return CODE_GENERATION_TIME;

-			case PRECOMPILE_TIME_VALUE: return PRECOMPILE_TIME;

-			case LINK_TIME_VALUE: return LINK_TIME;

-			case POST_BUILD_VALUE: return POST_BUILD;

-			case RUNTIME_VALUE: return RUNTIME;

+		switch(value) {

+		case SYSTEM_DESIGN_TIME_VALUE:

+			return SYSTEM_DESIGN_TIME;

+		case CODE_GENERATION_TIME_VALUE:

+			return CODE_GENERATION_TIME;

+		case PRECOMPILE_TIME_VALUE:

+			return PRECOMPILE_TIME;

+		case LINK_TIME_VALUE:

+			return LINK_TIME;

+		case POST_BUILD_VALUE:

+			return POST_BUILD;

+		case RUNTIME_VALUE:

+			return RUNTIME;

 		}

 		return null;

 	}

@@ -235,12 +253,13 @@ public enum BindingTimeKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Binding Time Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static BindingTimeKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			BindingTimeKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

+			if(result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -254,9 +273,9 @@ public enum BindingTimeKind implements Enumerator {
 	 * @generated

 	 */

 	public static BindingTimeKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			BindingTimeKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

+			if(result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -265,18 +284,21 @@ public enum BindingTimeKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final int value;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String name;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String literal;

@@ -284,6 +306,7 @@ public enum BindingTimeKind implements Enumerator {
 	/**

 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private BindingTimeKind(int value, String name, String literal) {

@@ -294,26 +317,29 @@ public enum BindingTimeKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getLiteral() {

-	  return literal;

+		return literal;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getName() {

-	  return name;

+		return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public int getValue() {

-	  return value;

+		return value;

 	}

 

 	/**

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/Feature.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/Feature.java
index 719367043ae..4cac05d9144 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/Feature.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/Feature.java
@@ -22,13 +22,16 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature</b></em>'. <!--

  * end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * A Feature represents a characteristic or trait of some object of consideration. The actual object of consideration depends on the particular purpose of the feature's containing feature model.

+ * A Feature represents a characteristic or trait of some object of consideration. The actual object of consideration depends on the particular

+ * purpose of the feature's containing feature model.

  * 

- * Example 1: The core technical feature model on vehicle level defines the technical properties of the complete-system, i.e. vehicle. So its object of consideration is the vehicle as a whole and therefore its features represent characteristics or traits of the vehicle as a whole.

+ * Example 1: The core technical feature model on vehicle level defines the technical properties of the complete-system, i.e. vehicle. So its object

+ * of consideration is the vehicle as a whole and therefore its features represent characteristics or traits of the vehicle as a whole.

  * 

- * Example 2: The public feature model of some function F in the FDA defines the features of this particular software function. So its object of consideration is function F and therefore its features represent characteristics or traits of this function F.

+ * Example 2: The public feature model of some function F in the FDA defines the features of this particular software function. So its object of

+ * consideration is function F and therefore its features represent characteristics or traits of this function F.

  * 

  * 

  * Semantics:

@@ -38,19 +41,19 @@ import org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype;
  * Extension:

  * Class

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality <em>Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime <em>Required Binding Time</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime <em>Actual Binding Time</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter <em>Feature Parameter</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getChildNode <em>Child Node</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality <em>Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime <em>Required Binding Time</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime <em>Actual Binding Time</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter <em>Feature Parameter</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getChildNode <em>Child Node</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeature()

  * @model

  * @generated

@@ -61,10 +64,10 @@ public interface Feature extends FeatureTreeNode {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeature_Base_Class()

@@ -77,7 +80,9 @@ public interface Feature extends FeatureTreeNode {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -87,8 +92,7 @@ public interface Feature extends FeatureTreeNode {
 	 * Returns the value of the '<em><b>Actual Binding Time</b></em>' reference. <!-- begin-user-doc

 	 * -->

 	 * <p>

-	 * If the meaning of the '<em>Actual Binding Time</em>' reference isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Actual Binding Time</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The actual binding time, independent of the

 	 * required binding time. <!-- end-model-doc -->

@@ -104,8 +108,7 @@ public interface Feature extends FeatureTreeNode {
 	/**

 	 * Returns the value of the '<em><b>Cardinality</b></em>' attribute. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Cardinality</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Cardinality</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The Cardinality describes for a feature its

 	 * cardinality. In the context of a feature group it describes the variability behavior of the

@@ -131,10 +134,10 @@ public interface Feature extends FeatureTreeNode {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Child Node</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Child Node</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Child Node</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeature_ChildNode()

 	 * @model ordered="false"

@@ -146,10 +149,10 @@ public interface Feature extends FeatureTreeNode {
 	 * Returns the value of the '<em><b>Feature Parameter</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature Parameter</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Feature Parameter</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Feature Parameter</em>' reference.

 	 * @see #setFeatureParameter(EADatatypePrototype)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeature_FeatureParameter()

@@ -159,10 +162,13 @@ public interface Feature extends FeatureTreeNode {
 	EADatatypePrototype getFeatureParameter();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter <em>Feature Parameter</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter <em>Feature Parameter</em>}'

+	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Feature Parameter</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Feature Parameter</em>' reference.

 	 * @see #getFeatureParameter()

 	 * @generated

 	 */

@@ -184,9 +190,12 @@ public interface Feature extends FeatureTreeNode {
 	BindingTime getRequiredBindingTime();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime <em>Actual Binding Time</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime <em>Actual Binding Time</em>}'

+	 * reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Actual Binding Time</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Actual Binding Time</em>' reference.

 	 * @see #getActualBindingTime()

 	 * @generated

 	 */

@@ -195,16 +204,21 @@ public interface Feature extends FeatureTreeNode {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality <em>Cardinality</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Cardinality</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Cardinality</em>' attribute.

 	 * @see #getCardinality()

 	 * @generated

 	 */

 	void setCardinality(String value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime <em>Required Binding Time</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime

+	 * <em>Required Binding Time</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Required Binding Time</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Required Binding Time</em>' reference.

 	 * @see #getRequiredBindingTime()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureConstraint.java
index ce30acad575..39feca03352 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureConstraint.java
@@ -21,22 +21,22 @@ import org.eclipse.uml2.uml.Constraint;
 
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Constraint</b></em>
- * '. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Constraint</b></em> '. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Captures a constraint on the containing feature model's configuration which is too complex to be expressed by way of a FeatureLink. In general, all constraints that can be expressed by a FeatureLink can also be expressed by a FeatureConstraint, but not vice versa.
+ * Captures a constraint on the containing feature model's configuration which is too complex to be expressed by way of a FeatureLink. In general, all
+ * constraints that can be expressed by a FeatureLink can also be expressed by a FeatureConstraint, but not vice versa.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion <em>Criterion</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion <em>Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureConstraint()
  * @model
  * @generated
@@ -59,9 +59,12 @@ public interface FeatureConstraint extends EAElement {
 	String getCriterion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion <em>Criterion</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion <em>Criterion</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Criterion</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Criterion</em>' attribute.
 	 * @see #getCriterion()
 	 * @generated
 	 */
@@ -71,10 +74,10 @@ public interface FeatureConstraint extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureConstraint_Base_Class()
@@ -84,10 +87,13 @@ public interface FeatureConstraint extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -97,10 +103,10 @@ public interface FeatureConstraint extends EAElement {
 	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Constraint</em>' reference.
 	 * @see #setBase_Constraint(Constraint)
 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureConstraint_Base_Constraint()
@@ -110,10 +116,13 @@ public interface FeatureConstraint extends EAElement {
 	Constraint getBase_Constraint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint
+	 * <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Constraint</em>' reference.
 	 * @see #getBase_Constraint()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureGroup.java
index f0d2b063140..f3f84bd35b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureGroup.java
@@ -20,9 +20,11 @@ import org.eclipse.emf.common.util.EList;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Group</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * FeatureGroup is a specialization of the FeatureTreeNode, enabling grouping of several Features. It specifies with its cardinality how these grouped features can be combined. For example, a FeatureGroup owning the two Features A and B, with a cardinality of [1] means that A and B are alternative.

+ * FeatureGroup is a specialization of the FeatureTreeNode, enabling grouping of several Features. It specifies with its cardinality how these grouped

+ * features can be combined. For example, a FeatureGroup owning the two Features A and B, with a cardinality of [1] means that A and B are

+ * alternative.

  * 

  * 

  * Semantics:

@@ -32,16 +34,16 @@ import org.eclipse.emf.common.util.EList;
  * Extension:

  * Class

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality <em>Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getChildFeature <em>Child Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality <em>Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getChildFeature <em>Child Feature</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureGroup()

  * @model

  * @generated

@@ -52,10 +54,10 @@ public interface FeatureGroup extends FeatureTreeNode {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureGroup_Base_Class()

@@ -68,7 +70,9 @@ public interface FeatureGroup extends FeatureTreeNode {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -77,8 +81,7 @@ public interface FeatureGroup extends FeatureTreeNode {
 	/**

 	 * Returns the value of the '<em><b>Cardinality</b></em>' attribute. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Cardinality</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Cardinality</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The Cardinality describes for a feature group

 	 * its cardinality. It describes the variability behavior of the group (e.g. a cardinality of 1

@@ -98,10 +101,10 @@ public interface FeatureGroup extends FeatureTreeNode {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Child Feature</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Child Feature</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Child Feature</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureGroup_ChildFeature()

 	 * @model lower="2" ordered="false"

@@ -110,10 +113,13 @@ public interface FeatureGroup extends FeatureTreeNode {
 	EList<Feature> getChildFeature();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality <em>Cardinality</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality <em>Cardinality</em>}'

+	 * attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Cardinality</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Cardinality</em>' attribute.

 	 * @see #getCardinality()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureLink.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureLink.java
index ab3c54ed5b9..c2bb9e7829e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureLink.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureLink.java
@@ -23,13 +23,18 @@ import org.eclipse.uml2.uml.Dependency;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Link</b></em>'. <!--

  * end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * A FeatureLink resembles a Relationship between two Features referred to as 'start' and 'end' feature (such as "feature S requires feature E" or "S excludes E").

+ * A FeatureLink resembles a Relationship between two Features referred to as 'start' and 'end' feature (such as "feature S requires feature E" or

+ * "S excludes E").

  * 

- * The type of the FeatureLink specifies the precise semantics of the relationship. There are several predefined types, for example "needs" states that S requires E. In addition, user-defined types are allowed as well. For user-defined types, attribute 'customType' provides a unique identifier of the custom link type and attribute 'isBidirectional' states whether the link is uni- or bidirectional.

+ * The type of the FeatureLink specifies the precise semantics of the relationship. There are several predefined types, for example "needs" states

+ * that S requires E. In addition, user-defined types are allowed as well. For user-defined types, attribute 'customType' provides a unique identifier

+ * of the custom link type and attribute 'isBidirectional' states whether the link is uni- or bidirectional.

  * 

- * FeatureLinks are similar to FeatureConstraints but much more restricted. The rationale for having FeatureLinks in addition to FeatureConstraints is that in many cases FeatureLinks are sufficient and tools can deal with them more easily and appropriately (e.g. they can easily be presented visually as arrows in a diagram).

+ * FeatureLinks are similar to FeatureConstraints but much more restricted. The rationale for having FeatureLinks in addition to FeatureConstraints is

+ * that in many cases FeatureLinks are sufficient and tools can deal with them more easily and appropriately (e.g. they can easily be presented

+ * visually as arrows in a diagram).

  * 

  * 

  * Semantics:

@@ -42,20 +47,20 @@ import org.eclipse.uml2.uml.Dependency;
  * Extension:

  * AssociationClass

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional <em>Is Bidirectional</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType <em>Custom Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency <em>Base Dependency</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getStart <em>Start</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getEnd <em>End</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass <em>Base Association Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getKind <em>Kind</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional <em>Is Bidirectional</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType <em>Custom Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency <em>Base Dependency</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getStart <em>Start</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getEnd <em>End</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass <em>Base Association Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getKind <em>Kind</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureLink()

  * @model

  * @generated

@@ -66,10 +71,10 @@ public interface FeatureLink extends Relationship {
 	 * Returns the value of the '<em><b>Custom Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Custom Type</em>' attribute isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Custom Type</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Custom Type</em>' attribute.

 	 * @see #setCustomType(String)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureLink_CustomType()

@@ -80,12 +85,10 @@ public interface FeatureLink extends Relationship {
 

 	/**

 	 * Returns the value of the '<em><b>End</b></em>' reference. It is bidirectional and its

-	 * opposite is '

-	 * {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getEndingLink

+	 * opposite is ' {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getEndingLink

 	 * <em>Ending Link</em>}'. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>End</em>' reference isn't clear, there really should be more of a

-	 * description here...

+	 * If the meaning of the '<em>End</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The target feature of the dependency. {derived

 	 * from UML::DirectedRelationship::target} <!-- end-model-doc -->

@@ -104,10 +107,10 @@ public interface FeatureLink extends Relationship {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 	 * @see #setKind(VariabilityDependencyKind)

@@ -119,12 +122,10 @@ public interface FeatureLink extends Relationship {
 

 	/**

 	 * Returns the value of the '<em><b>Start</b></em>' reference. It is bidirectional and its

-	 * opposite is '

-	 * {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getStartingLink

+	 * opposite is ' {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getStartingLink

 	 * <em>Starting Link</em>}'. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Start</em>' reference isn't clear, there really should be more of

-	 * a description here...

+	 * If the meaning of the '<em>Start</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The source feature of the dependency. {derived

 	 * from UML::DirectedRelationship::source} <!-- end-model-doc -->

@@ -142,10 +143,10 @@ public interface FeatureLink extends Relationship {
 	 * Returns the value of the '<em><b>Is Bidirectional</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Is Bidirectional</em>' attribute isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Is Bidirectional</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Is Bidirectional</em>' attribute.

 	 * @see #setIsBidirectional(boolean)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureLink_IsBidirectional()

@@ -158,7 +159,9 @@ public interface FeatureLink extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType <em>Custom Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Custom Type</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Custom Type</em>' attribute.

 	 * @see #getCustomType()

 	 * @generated

 	 */

@@ -168,10 +171,10 @@ public interface FeatureLink extends Relationship {
 	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Dependency</em>' reference.

 	 * @see #setBase_Dependency(Dependency)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureLink_Base_Dependency()

@@ -181,10 +184,13 @@ public interface FeatureLink extends Relationship {
 	Dependency getBase_Dependency();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency <em>Base Dependency</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency <em>Base Dependency</em>}'

+	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Dependency</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Dependency</em>' reference.

 	 * @see #getBase_Dependency()

 	 * @generated

 	 */

@@ -194,7 +200,9 @@ public interface FeatureLink extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getEnd <em>End</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>End</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>End</em>' reference.

 	 * @see #getEnd()

 	 * @generated

 	 */

@@ -204,10 +212,10 @@ public interface FeatureLink extends Relationship {
 	 * Returns the value of the '<em><b>Base Association Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Association Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Association Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Association Class</em>' reference.

 	 * @see #setBase_AssociationClass(AssociationClass)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureLink_Base_AssociationClass()

@@ -217,19 +225,25 @@ public interface FeatureLink extends Relationship {
 	AssociationClass getBase_AssociationClass();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass <em>Base Association Class</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass

+	 * <em>Base Association Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Association Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Association Class</em>' reference.

 	 * @see #getBase_AssociationClass()

 	 * @generated

 	 */

 	void setBase_AssociationClass(AssociationClass value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional <em>Is Bidirectional</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional <em>Is Bidirectional</em>}'

+	 * attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Is Bidirectional</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Is Bidirectional</em>' attribute.

 	 * @see #isIsBidirectional()

 	 * @generated

 	 */

@@ -239,7 +253,9 @@ public interface FeatureLink extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getKind <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Kind</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 	 * @see #getKind()

 	 * @generated

@@ -250,7 +266,9 @@ public interface FeatureLink extends Relationship {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getStart <em>Start</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Start</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Start</em>' reference.

 	 * @see #getStart()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
index 8ba4cd160db..209840c214f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
@@ -22,13 +22,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Model</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * FeatureModel denotes a model owning Features. The FeatureModel can be used to describe variability and commonality of a specified EE-System at any abstraction level in the SystemModel.

+ * FeatureModel denotes a model owning Features. The FeatureModel can be used to describe variability and commonality of a specified EE-System at any

+ * abstraction level in the SystemModel.

  * 

- * The FeatureModel can be used either to describe the variability within a particular Function or to describe the overall variability of a vehicle (cf. VehicleLevel). The FeatureModel describing internal variability of a FunctionType refers to the VehicleLevel by a «realizes» link (informative).

+ * The FeatureModel can be used either to describe the variability within a particular Function or to describe the overall variability of a vehicle

+ * (cf. VehicleLevel). The FeatureModel describing internal variability of a FunctionType refers to the VehicleLevel by a «realizes» link

+ * (informative).

  * 

- * Note, however, that a FeatureModel per definition does not always have to define variability. If a feature model contains only mandatory features, then its purpose is completely unrelated to variability. The features in such a FeatureModel could serve, for example, as invariant "coarse-grained requirements". The most important example is the core technical feature model on vehicle level which is also used for SystemModels that do not contain any variability at all. However, most uses of feature models in EAST-ADL2 are primarily motivated by variability definition and management.

+ * Note, however, that a FeatureModel per definition does not always have to define variability. If a feature model contains only mandatory features,

+ * then its purpose is completely unrelated to variability. The features in such a FeatureModel could serve, for example, as invariant

+ * "coarse-grained requirements". The most important example is the core technical feature model on vehicle level which is also used for SystemModels

+ * that do not contain any variability at all. However, most uses of feature models in EAST-ADL2 are primarily motivated by variability definition and

+ * management.

  * 

  * A public, local FeatureModel of an artifact element realizes a VehicleFeature of the VehicleLevel.

  * 

@@ -40,18 +47,18 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * Extension:

  * Package

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature <em>Root Feature</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink <em>Feature Link</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint <em>Feature Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature <em>Root Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink <em>Feature Link</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint <em>Feature Constraint</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel()

  * @model

  * @generated

@@ -62,10 +69,10 @@ public interface FeatureModel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Package</em>' reference.

 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_Base_Package()

@@ -75,10 +82,13 @@ public interface FeatureModel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}'

+	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Package</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Package</em>' reference.

 	 * @see #getBase_Package()

 	 * @generated

 	 */

@@ -88,10 +98,10 @@ public interface FeatureModel extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_Base_Class()

@@ -104,7 +114,9 @@ public interface FeatureModel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -115,10 +127,11 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature Constraint</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Feature Constraint</em>' containment reference list isn't clear, there really should be more of a description

+	 * here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Feature Constraint</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_FeatureConstraint()

 	 * @model ordered="false"

@@ -131,10 +144,10 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature Link</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Feature Link</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Feature Link</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_FeatureLink()

 	 * @model ordered="false"

@@ -147,10 +160,10 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Root Feature</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Root Feature</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Root Feature</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_RootFeature()

 	 * @model ordered="false"

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureTreeNode.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureTreeNode.java
index a1ac4b06d39..297650df15a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureTreeNode.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureTreeNode.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Tree Node</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

  * The abstract base class for all nodes in a feature tree.

  * 

@@ -29,11 +29,11 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * FeatureTreeNode has no specific semantics. Further subclasses of FeatureTreeNode will add semantics appropriate to the concept they represent.

  * 

  * 

- * Extension: 

+ * Extension:

  * abstract, no extension

  * <!-- end-model-doc -->

- *

- *

+ * 

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureTreeNode()

  * @model abstract="true"

  * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingFactory.java
index fe5251f1c07..8ade57592af 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	FeaturemodelingFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Binding Time</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Binding Time</em>'.

 	 * @generated

 	 */

@@ -54,6 +57,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Constraint</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Feature Constraint</em>'.

 	 * @generated

 	 */

@@ -63,6 +67,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Group</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Feature Group</em>'.

 	 * @generated

 	 */

@@ -72,6 +77,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Link</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Feature Link</em>'.

 	 * @generated

 	 */

@@ -81,6 +87,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Model</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Feature Model</em>'.

 	 * @generated

 	 */

@@ -89,6 +96,7 @@ public interface FeaturemodelingFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingPackage.java
index 1d8a450685b..dcbd1925aaf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeaturemodelingPackage.java
@@ -53,13 +53,16 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl <em>Feature Model</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl <em>Feature Model</em>}

+		 * ' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureModel()

 		 * @generated

@@ -86,6 +89,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Root Feature</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_MODEL__ROOT_FEATURE = eINSTANCE.getFeatureModel_RootFeature();

@@ -94,6 +98,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Feature Link</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_MODEL__FEATURE_LINK = eINSTANCE.getFeatureModel_FeatureLink();

@@ -102,13 +107,16 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Feature Constraint</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_MODEL__FEATURE_CONSTRAINT = eINSTANCE.getFeatureModel_FeatureConstraint();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl <em>Feature Link</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl <em>Feature Link</em>}'

+		 * class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureLink()

 		 * @generated

@@ -118,6 +126,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Bidirectional</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FEATURE_LINK__IS_BIDIRECTIONAL = eINSTANCE.getFeatureLink_IsBidirectional();

@@ -126,6 +135,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Custom Type</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FEATURE_LINK__CUSTOM_TYPE = eINSTANCE.getFeatureLink_CustomType();

@@ -158,6 +168,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Association Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_LINK__BASE_ASSOCIATION_CLASS = eINSTANCE.getFeatureLink_Base_AssociationClass();

@@ -166,6 +177,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FEATURE_LINK__KIND = eINSTANCE.getFeatureLink_Kind();

@@ -173,6 +185,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl <em>Feature</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeature()

 		 * @generated

@@ -198,6 +211,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Required Binding Time</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE__REQUIRED_BINDING_TIME = eINSTANCE.getFeature_RequiredBindingTime();

@@ -205,6 +219,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Actual Binding Time</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE__ACTUAL_BINDING_TIME = eINSTANCE.getFeature_ActualBindingTime();

@@ -213,6 +228,7 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Feature Parameter</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE__FEATURE_PARAMETER = eINSTANCE.getFeature_FeatureParameter();

@@ -221,13 +237,16 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Child Node</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE__CHILD_NODE = eINSTANCE.getFeature_ChildNode();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl <em>Feature Tree Node</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl

+		 * <em>Feature Tree Node</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureTreeNode()

 		 * @generated

@@ -235,8 +254,10 @@ public interface FeaturemodelingPackage extends EPackage {
 		EClass FEATURE_TREE_NODE = eINSTANCE.getFeatureTreeNode();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl <em>Binding Time</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl <em>Binding Time</em>}'

+		 * class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getBindingTime()

 		 * @generated

@@ -260,8 +281,10 @@ public interface FeaturemodelingPackage extends EPackage {
 		EReference BINDING_TIME__BASE_CLASS = eINSTANCE.getBindingTime_Base_Class();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl <em>Feature Group</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl <em>Feature Group</em>}

+		 * ' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureGroup()

 		 * @generated

@@ -288,13 +311,16 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Child Feature</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_GROUP__CHILD_FEATURE = eINSTANCE.getFeatureGroup_ChildFeature();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl <em>Feature Constraint</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl

+		 * <em>Feature Constraint</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureConstraint()

 		 * @generated

@@ -321,13 +347,16 @@ public interface FeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getFeatureConstraint_Base_Constraint();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind <em>Binding Time Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind <em>Binding Time Kind</em>}'

+		 * enum.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getBindingTimeKind()

 		 * @generated

@@ -335,9 +364,11 @@ public interface FeaturemodelingPackage extends EPackage {
 		EEnum BINDING_TIME_KIND = eINSTANCE.getBindingTimeKind();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind <em>Variability Dependency Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

+		 * <em>Variability Dependency Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 		 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getVariabilityDependencyKind()

 		 * @generated

@@ -349,6 +380,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "featuremodeling";

@@ -356,6 +388,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/FeatureModeling/1";

@@ -363,6 +396,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "FeatureModeling";

@@ -370,6 +404,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	FeaturemodelingPackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl.init();

@@ -377,6 +412,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl <em>Feature Model</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureModel()

 	 * @generated

@@ -386,6 +422,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl <em>Feature Link</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureLink()

 	 * @generated

@@ -395,6 +432,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl <em>Feature</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeature()

 	 * @generated

@@ -402,8 +440,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	int FEATURE = 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl <em>Feature Tree Node</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl <em>Feature Tree Node</em>}'

+	 * class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureTreeNodeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureTreeNode()

 	 * @generated

@@ -413,6 +453,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl <em>Binding Time</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getBindingTime()

 	 * @generated

@@ -422,6 +463,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl <em>Feature Group</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureGroup()

 	 * @generated

@@ -429,8 +471,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	int FEATURE_GROUP = 6;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl <em>Feature Constraint</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl

+	 * <em>Feature Constraint</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getFeatureConstraint()

 	 * @generated

@@ -441,6 +485,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -450,6 +495,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -486,6 +532,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -495,6 +542,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -504,6 +552,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Feature</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -513,6 +562,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature Link</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -522,6 +572,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature Constraint</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -531,6 +582,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Model</em>' class.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -540,6 +592,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -549,6 +602,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -594,6 +648,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -603,6 +658,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -639,6 +695,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -648,6 +705,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Cardinality</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -657,6 +715,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Required Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -666,6 +725,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Actual Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -675,6 +735,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature Parameter</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -684,6 +745,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Node</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -693,6 +755,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -702,6 +765,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -711,6 +775,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -720,6 +785,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -729,6 +795,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -738,6 +805,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -747,6 +815,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Binding Time</em>' class.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -756,6 +825,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -765,6 +835,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -783,6 +854,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Bidirectional</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -792,6 +864,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Custom Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -801,6 +874,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -810,6 +884,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Start</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -819,6 +894,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>End</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -828,6 +904,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Association Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -837,6 +914,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -846,6 +924,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Link</em>' class.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -855,6 +934,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -864,6 +944,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -873,6 +954,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -882,6 +964,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Criterion</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -891,6 +974,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -900,6 +984,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -918,6 +1003,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -927,6 +1013,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -963,6 +1050,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -972,6 +1060,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Cardinality</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -981,6 +1070,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Feature</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -990,6 +1080,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Group</em>' class.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -998,6 +1089,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind <em>Binding Time Kind</em>}' enum.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getBindingTimeKind()

 	 * @generated

@@ -1005,9 +1097,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	int BINDING_TIME_KIND = 7;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind <em>Variability Dependency Kind</em>}' enum.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

+	 * <em>Variability Dependency Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeaturemodelingPackageImpl#getVariabilityDependencyKind()

 	 * @generated

@@ -1017,6 +1111,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime <em>Binding Time</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Binding Time</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime

 	 * @generated

@@ -1026,6 +1121,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getKind <em>Kind</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getKind()

 	 * @see #getBindingTime()

@@ -1034,9 +1130,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EAttribute getBindingTime_Kind();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime#getBase_Class()

 	 * @see #getBindingTime()

@@ -1047,6 +1145,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind <em>Binding Time Kind</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Binding Time Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind

 	 * @generated

@@ -1056,6 +1155,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature <em>Feature</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature

 	 * @generated

@@ -1063,9 +1163,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeature();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getBase_Class()

 	 * @see #getFeature()

@@ -1074,8 +1176,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeature_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime <em>Actual Binding Time</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime

+	 * <em>Actual Binding Time</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Actual Binding Time</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getActualBindingTime()

 	 * @see #getFeature()

@@ -1084,8 +1188,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeature_ActualBindingTime();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality <em>Cardinality</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality

+	 * <em>Cardinality</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Cardinality</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getCardinality()

 	 * @see #getFeature()

@@ -1094,9 +1200,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EAttribute getFeature_Cardinality();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getChildNode <em>Child Node</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getChildNode

+	 * <em>Child Node</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Child Node</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getChildNode()

 	 * @see #getFeature()

@@ -1105,9 +1213,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeature_ChildNode();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter <em>Feature Parameter</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter

+	 * <em>Feature Parameter</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Feature Parameter</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getFeatureParameter()

 	 * @see #getFeature()

@@ -1116,8 +1226,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeature_FeatureParameter();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime <em>Required Binding Time</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime

+	 * <em>Required Binding Time</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Required Binding Time</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature#getRequiredBindingTime()

 	 * @see #getFeature()

@@ -1126,8 +1238,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeature_RequiredBindingTime();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint <em>Feature Constraint</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint <em>Feature Constraint</em>}

+	 * '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Constraint</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint

 	 * @generated

@@ -1135,8 +1249,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeatureConstraint();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion <em>Criterion</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion

+	 * <em>Criterion</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Criterion</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getCriterion()

 	 * @see #getFeatureConstraint()

@@ -1145,9 +1261,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EAttribute getFeatureConstraint_Criterion();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Class()

 	 * @see #getFeatureConstraint()

@@ -1156,9 +1274,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureConstraint_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint <em>Base Constraint</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint

+	 * <em>Base Constraint</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Constraint</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint#getBase_Constraint()

 	 * @see #getFeatureConstraint()

@@ -1169,6 +1289,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup <em>Feature Group</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup

 	 * @generated

@@ -1176,9 +1297,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeatureGroup();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getBase_Class()

 	 * @see #getFeatureGroup()

@@ -1187,8 +1310,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureGroup_Base_Class();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality <em>Cardinality</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality

+	 * <em>Cardinality</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Cardinality</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getCardinality()

 	 * @see #getFeatureGroup()

@@ -1197,9 +1322,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EAttribute getFeatureGroup_Cardinality();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getChildFeature <em>Child Feature</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getChildFeature

+	 * <em>Child Feature</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Child Feature</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup#getChildFeature()

 	 * @see #getFeatureGroup()

@@ -1210,6 +1337,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink <em>Feature Link</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Link</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink

 	 * @generated

@@ -1217,9 +1345,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeatureLink();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType <em>Custom Type</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType

+	 * <em>Custom Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Custom Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getCustomType()

 	 * @see #getFeatureLink()

@@ -1228,9 +1358,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EAttribute getFeatureLink_CustomType();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency <em>Base Dependency</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency

+	 * <em>Base Dependency</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Dependency</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_Dependency()

 	 * @see #getFeatureLink()

@@ -1241,6 +1373,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getEnd <em>End</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>End</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getEnd()

 	 * @see #getFeatureLink()

@@ -1249,9 +1382,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureLink_End();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass <em>Base Association Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass

+	 * <em>Base Association Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Association Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getBase_AssociationClass()

 	 * @see #getFeatureLink()

@@ -1260,8 +1395,10 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureLink_Base_AssociationClass();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional <em>Is Bidirectional</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional

+	 * <em>Is Bidirectional</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Bidirectional</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#isIsBidirectional()

 	 * @see #getFeatureLink()

@@ -1273,6 +1410,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getKind <em>Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getKind()

 	 * @see #getFeatureLink()

@@ -1283,6 +1421,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getStart <em>Start</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Start</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink#getStart()

 	 * @see #getFeatureLink()

@@ -1293,6 +1432,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel <em>Feature Model</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel

 	 * @generated

@@ -1300,9 +1440,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeatureModel();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package()

 	 * @see #getFeatureModel()

@@ -1311,9 +1453,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureModel_Base_Package();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class()

 	 * @see #getFeatureModel()

@@ -1322,9 +1466,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureModel_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint <em>Feature Constraint</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint

+	 * <em>Feature Constraint</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Feature Constraint</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint()

 	 * @see #getFeatureModel()

@@ -1333,9 +1479,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureModel_FeatureConstraint();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink <em>Feature Link</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink

+	 * <em>Feature Link</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Feature Link</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink()

 	 * @see #getFeatureModel()

@@ -1344,9 +1492,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EReference getFeatureModel_FeatureLink();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature <em>Root Feature</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature

+	 * <em>Root Feature</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Root Feature</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature()

 	 * @see #getFeatureModel()

@@ -1358,6 +1508,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -1366,6 +1517,7 @@ public interface FeaturemodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode <em>Feature Tree Node</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Tree Node</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode

 	 * @generated

@@ -1373,9 +1525,11 @@ public interface FeaturemodelingPackage extends EPackage {
 	EClass getFeatureTreeNode();

 

 	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind <em>Variability Dependency Kind</em>}'.

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

+	 * <em>Variability Dependency Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Variability Dependency Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 	 * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/VariabilityDependencyKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/VariabilityDependencyKind.java
index 4bc4ecb9d44..398b19dc47f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/VariabilityDependencyKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/VariabilityDependencyKind.java
@@ -27,14 +27,16 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * This enumeration encapsulates the available types of constraints that can be applied to a FeatureLink or VariationGroup (the latter is applicable only if the variability extension is used).
+ * This enumeration encapsulates the available types of constraints that can be applied to a FeatureLink or VariationGroup (the latter is applicable
+ * only if the variability extension is used).
  * 
  * Semantics:
  * Predefined kinds of constraints that can be associated to a FeatureLink or VariationGroup.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getVariabilityDependencyKind()
  * @model
  * @generated
@@ -44,6 +46,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Needs</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NEEDS_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Optional Alternative</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPTIONAL_ALTERNATIVE_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +68,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Custom</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CUSTOM_VALUE
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Mandatory Alternative</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MANDATORY_ALTERNATIVE_VALUE
 	 * @generated
 	 * @ordered
@@ -84,6 +90,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Suggests</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SUGGESTS_VALUE
 	 * @generated
 	 * @ordered
@@ -94,6 +101,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * The '<em><b>Impedes</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IMPEDES_VALUE
 	 * @generated
 	 * @ordered
@@ -105,10 +113,13 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * When used in a FeatureLink: if the FeatureLink's start feature S is selected, then also its end feature E must be selected: not (S and not E). Always unidirectional.
+	 * When used in a FeatureLink: if the FeatureLink's start feature S is selected, then also its end feature E must be selected: not (S and not E).
+	 * Always unidirectional.
 	 * 
-	 * When used in a VariationGroup: assuming the ordered association variableElement in meta-class VariationGroup refers to elements VE1, VE2, ..., VEn, this kind states that VE1 requires (i.e. may not appear without) all other elements VE2, VE3, ..., VEn.
+	 * When used in a VariationGroup: assuming the ordered association variableElement in meta-class VariationGroup refers to elements VE1, VE2, ...,
+	 * VEn, this kind states that VE1 requires (i.e. may not appear without) all other elements VE2, VE3, ..., VEn.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #NEEDS
 	 * @model name="needs"
 	 * @generated
@@ -121,10 +132,13 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * When used in a FeatureLink: the FeatureLink's start feature S and end feature E are incompatible and must never be both selected in a single configuration: not (S and E). Always bidirectional.
+	 * When used in a FeatureLink: the FeatureLink's start feature S and end feature E are incompatible and must never be both selected in a single
+	 * configuration: not (S and E). Always bidirectional.
 	 * 
-	 * When used in a VariationGroup: this kind states that at most(!) one element of the elements denoted by association variableElement of the VariationGroup must be selected in any valid final system configuration.
+	 * When used in a VariationGroup: this kind states that at most(!) one element of the elements denoted by association variableElement of the
+	 * VariationGroup must be selected in any valid final system configuration.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #OPTIONAL_ALTERNATIVE
 	 * @model name="optionalAlternative"
 	 * @generated
@@ -139,8 +153,10 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * When used in a FeatureLink: the attribute customType in the FeatureLink defines the custom feature link type as explained there.
 	 * 
-	 * When used in a VariationGroup: this kind states that the dependency between the elements denoted by association variableElement of the VariationGroup will be defined by a logical expression in attribute 'constraint' of the VariationGroup.
+	 * When used in a VariationGroup: this kind states that the dependency between the elements denoted by association variableElement of the
+	 * VariationGroup will be defined by a logical expression in attribute 'constraint' of the VariationGroup.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #CUSTOM
 	 * @model name="custom"
 	 * @generated
@@ -153,10 +169,13 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * When used in a FeatureLink: either the FeatureLink's start feature S or its end feature E must be selected in any configuration: S xor E. Always bidirectional.
+	 * When used in a FeatureLink: either the FeatureLink's start feature S or its end feature E must be selected in any configuration: S xor E.
+	 * Always bidirectional.
 	 * 
-	 * When used in a VariationGroup: this kind states that exactly(!) one element of the elements denoted by association variableElement of the VariationGroup must be selected in any valid final system configuration.
+	 * When used in a VariationGroup: this kind states that exactly(!) one element of the elements denoted by association variableElement of the
+	 * VariationGroup must be selected in any valid final system configuration.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #MANDATORY_ALTERNATIVE
 	 * @model name="mandatoryAlternative"
 	 * @generated
@@ -169,12 +188,14 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * Weak form of "needs". 
+	 * Weak form of "needs".
 	 * 
-	 * When used in a FeatureLink: if the FeatureLink's start feature S is selected, then usually(!) also its end feature E must be selected. You can select S without E but you should have a good reason to do so. Always unidirectional.
+	 * When used in a FeatureLink: if the FeatureLink's start feature S is selected, then usually(!) also its end feature E must be selected. You can
+	 * select S without E but you should have a good reason to do so. Always unidirectional.
 	 * 
 	 * When used in a VariationGroup: accordingly as above.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #SUGGESTS
 	 * @model name="suggests"
 	 * @generated
@@ -189,10 +210,12 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Weak from of "excludes".
 	 * 
-	 * When used in a FeatureLink: the FeatureLink's start feature S and its end feature E must usually(!) not be selected in a single configuration. You can select S together with E but you should have a good reason to do so. Always bidirectional.
+	 * When used in a FeatureLink: the FeatureLink's start feature S and its end feature E must usually(!) not be selected in a single configuration.
+	 * You can select S together with E but you should have a good reason to do so. Always bidirectional.
 	 * 
 	 * When used in a VariationGroup: accordingly as above.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #IMPEDES
 	 * @model name="impedes"
 	 * @generated
@@ -204,22 +227,16 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * An array of all the '<em><b>Variability Dependency Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final VariabilityDependencyKind[] VALUES_ARRAY =
-		new VariabilityDependencyKind[] {
-			NEEDS,
-			OPTIONAL_ALTERNATIVE,
-			CUSTOM,
-			MANDATORY_ALTERNATIVE,
-			SUGGESTS,
-			IMPEDES,
-		};
+	private static final VariabilityDependencyKind[] VALUES_ARRAY = new VariabilityDependencyKind[]{ NEEDS, OPTIONAL_ALTERNATIVE, CUSTOM, MANDATORY_ALTERNATIVE, SUGGESTS, IMPEDES, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Variability Dependency Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<VariabilityDependencyKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -228,16 +245,23 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * Returns the '<em><b>Variability Dependency Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static VariabilityDependencyKind get(int value) {
-		switch (value) {
-			case NEEDS_VALUE: return NEEDS;
-			case OPTIONAL_ALTERNATIVE_VALUE: return OPTIONAL_ALTERNATIVE;
-			case CUSTOM_VALUE: return CUSTOM;
-			case MANDATORY_ALTERNATIVE_VALUE: return MANDATORY_ALTERNATIVE;
-			case SUGGESTS_VALUE: return SUGGESTS;
-			case IMPEDES_VALUE: return IMPEDES;
+		switch(value) {
+		case NEEDS_VALUE:
+			return NEEDS;
+		case OPTIONAL_ALTERNATIVE_VALUE:
+			return OPTIONAL_ALTERNATIVE;
+		case CUSTOM_VALUE:
+			return CUSTOM;
+		case MANDATORY_ALTERNATIVE_VALUE:
+			return MANDATORY_ALTERNATIVE;
+		case SUGGESTS_VALUE:
+			return SUGGESTS;
+		case IMPEDES_VALUE:
+			return IMPEDES;
 		}
 		return null;
 	}
@@ -246,12 +270,13 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * Returns the '<em><b>Variability Dependency Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static VariabilityDependencyKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			VariabilityDependencyKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -262,12 +287,13 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * Returns the '<em><b>Variability Dependency Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static VariabilityDependencyKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			VariabilityDependencyKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -277,6 +303,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -284,6 +311,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -291,6 +319,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -299,6 +328,7 @@ public enum VariabilityDependencyKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private VariabilityDependencyKind(int value, String name, String literal) {
@@ -310,39 +340,43 @@ public enum VariabilityDependencyKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //VariabilityDependencyKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/BindingTimeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/BindingTimeImpl.java
index 9928d677ce4..3c66340dcf1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/BindingTimeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/BindingTimeImpl.java
@@ -31,11 +31,11 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.BindingTimeImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class BindingTimeImpl extends EAElementImpl implements BindingTime {
@@ -44,6 +44,7 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -54,6 +55,7 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -72,6 +75,7 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BindingTimeImpl() {
@@ -80,54 +84,59 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FeaturemodelingPackage.BINDING_TIME__KIND:
-				return getKind();
-			case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case FeaturemodelingPackage.BINDING_TIME__KIND:
+			return getKind();
+		case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FeaturemodelingPackage.BINDING_TIME__KIND:
-				return kind != KIND_EDEFAULT;
-			case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case FeaturemodelingPackage.BINDING_TIME__KIND:
+			return kind != KIND_EDEFAULT;
+		case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FeaturemodelingPackage.BINDING_TIME__KIND:
-				setKind((BindingTimeKind)newValue);
-				return;
-			case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case FeaturemodelingPackage.BINDING_TIME__KIND:
+			setKind((BindingTimeKind)newValue);
+			return;
+		case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,23 +146,25 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FeaturemodelingPackage.BINDING_TIME__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
-			case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case FeaturemodelingPackage.BINDING_TIME__KIND:
+			setKind(KIND_EDEFAULT);
+			return;
+		case FeaturemodelingPackage.BINDING_TIME__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingTimeKind getKind() {
@@ -162,26 +173,28 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKind(BindingTimeKind newKind) {
 		BindingTimeKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.BINDING_TIME__KIND, oldKind, kind));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.BINDING_TIME__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -191,6 +204,7 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -200,22 +214,25 @@ public class BindingTimeImpl extends EAElementImpl implements BindingTime {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.BINDING_TIME__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureConstraintImpl.java
index 282cf2b8fc8..2986dbbbcb1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureConstraintImpl.java
@@ -26,17 +26,16 @@ import org.eclipse.uml2.uml.Constraint;
 
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Feature Constraint</b></em>
- * '. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Feature Constraint</b></em> '. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getCriterion <em>Criterion</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getCriterion <em>Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FeatureConstraintImpl extends EAElementImpl implements FeatureConstraint {
@@ -65,6 +64,7 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -75,6 +75,7 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Constraint()
 	 * @generated
 	 * @ordered
@@ -83,6 +84,7 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FeatureConstraintImpl() {
@@ -91,62 +93,68 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
-				return getCriterion();
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
+		switch(featureID) {
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
+			return getCriterion();
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
+			if(resolve)
+				return getBase_Constraint();
+			return basicGetBase_Constraint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
-				return CRITERION_EDEFAULT == null ? criterion != null : !CRITERION_EDEFAULT.equals(criterion);
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
-				return base_Class != null;
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
-				return base_Constraint != null;
+		switch(featureID) {
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
+			return CRITERION_EDEFAULT == null ? criterion != null : !CRITERION_EDEFAULT.equals(criterion);
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
+			return base_Class != null;
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
+			return base_Constraint != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
-				setCriterion((String)newValue);
-				return;
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
+		switch(featureID) {
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
+			setCriterion((String)newValue);
+			return;
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,26 +164,28 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
-				setCriterion(CRITERION_EDEFAULT);
-				return;
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
+		switch(featureID) {
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION:
+			setCriterion(CRITERION_EDEFAULT);
+			return;
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCriterion() {
@@ -184,26 +194,28 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCriterion(String newCriterion) {
 		String oldCriterion = criterion;
 		criterion = newCriterion;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_CONSTRAINT__CRITERION, oldCriterion, criterion));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -213,6 +225,7 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -222,26 +235,28 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
+		if(base_Constraint != null && base_Constraint.eIsProxy()) {
 			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
 			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
+			if(base_Constraint != oldBase_Constraint) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 			}
 		}
@@ -251,6 +266,7 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint basicGetBase_Constraint() {
@@ -260,22 +276,25 @@ public class FeatureConstraintImpl extends EAElementImpl implements FeatureConst
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Constraint(Constraint newBase_Constraint) {
 		Constraint oldBase_Constraint = base_Constraint;
 		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (criterion: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureGroupImpl.java
index a2473ecb0a3..56599c55508 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureGroupImpl.java
@@ -34,12 +34,12 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getCardinality <em>Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getChildFeature <em>Child Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getCardinality <em>Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureGroupImpl#getChildFeature <em>Child Feature</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGroup {

@@ -48,6 +48,7 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -58,6 +59,7 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	 * The default value of the '{@link #getCardinality() <em>Cardinality</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getCardinality()

 	 * @generated

 	 * @ordered

@@ -77,6 +79,7 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	/**

 	 * The cached value of the '{@link #getChildFeature() <em>Child Feature</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getChildFeature()

 	 * @generated

 	 * @ordered

@@ -85,6 +88,7 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeatureGroupImpl() {

@@ -93,63 +97,68 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

-				if (resolve) return getBase_Class();

-				return basicGetBase_Class();

-			case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

-				return getCardinality();

-			case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

-				return getChildFeature();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

+			if(resolve)

+				return getBase_Class();

+			return basicGetBase_Class();

+		case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

+			return getCardinality();

+		case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

+			return getChildFeature();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

-				return base_Class != null;

-			case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

-				return CARDINALITY_EDEFAULT == null ? cardinality != null : !CARDINALITY_EDEFAULT.equals(cardinality);

-			case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

-				return childFeature != null && !childFeature.isEmpty();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

+			return base_Class != null;

+		case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

+			return CARDINALITY_EDEFAULT == null ? cardinality != null : !CARDINALITY_EDEFAULT.equals(cardinality);

+		case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

+			return childFeature != null && !childFeature.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

-				setCardinality((String)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

-				getChildFeature().clear();

-				getChildFeature().addAll((Collection<? extends Feature>)newValue);

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

+			setCardinality((String)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

+			getChildFeature().clear();

+			getChildFeature().addAll((Collection<? extends Feature>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -160,14 +169,15 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if (base_Class != null && base_Class.eIsProxy()) {

+		if(base_Class != null && base_Class.eIsProxy()) {

 			InternalEObject oldBase_Class = (InternalEObject)base_Class;

 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if (base_Class != oldBase_Class) {

-				if (eNotificationRequired())

+			if(base_Class != oldBase_Class) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS, oldBase_Class, base_Class));

 			}

 		}

@@ -177,6 +187,7 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -186,37 +197,40 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS, oldBase_Class, base_Class));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

-				setCardinality(CARDINALITY_EDEFAULT);

-				return;

-			case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

-				getChildFeature().clear();

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_GROUP__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY:

+			setCardinality(CARDINALITY_EDEFAULT);

+			return;

+		case FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE:

+			getChildFeature().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getCardinality() {

@@ -225,10 +239,11 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<Feature> getChildFeature() {

-		if (childFeature == null) {

+		if(childFeature == null) {

 			childFeature = new EObjectResolvingEList<Feature>(Feature.class, this, FeaturemodelingPackage.FEATURE_GROUP__CHILD_FEATURE);

 		}

 		return childFeature;

@@ -237,23 +252,26 @@ public class FeatureGroupImpl extends FeatureTreeNodeImpl implements FeatureGrou
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setCardinality(String newCardinality) {

 		String oldCardinality = cardinality;

 		cardinality = newCardinality;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_GROUP__CARDINALITY, oldCardinality, cardinality));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (cardinality: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureImpl.java
index e4b3baec598..8383e15a717 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureImpl.java
@@ -36,15 +36,15 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getCardinality <em>Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getRequiredBindingTime <em>Required Binding Time</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getActualBindingTime <em>Actual Binding Time</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getFeatureParameter <em>Feature Parameter</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getChildNode <em>Child Node</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getCardinality <em>Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getRequiredBindingTime <em>Required Binding Time</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getActualBindingTime <em>Actual Binding Time</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getFeatureParameter <em>Feature Parameter</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureImpl#getChildNode <em>Child Node</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {

@@ -53,6 +53,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -82,6 +83,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * The cached value of the '{@link #getRequiredBindingTime() <em>Required Binding Time</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getRequiredBindingTime()

 	 * @generated

 	 * @ordered

@@ -91,6 +93,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * The cached value of the '{@link #getActualBindingTime() <em>Actual Binding Time</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getActualBindingTime()

 	 * @generated

 	 * @ordered

@@ -100,6 +103,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * The cached value of the '{@link #getFeatureParameter() <em>Feature Parameter</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getFeatureParameter()

 	 * @generated

 	 * @ordered

@@ -109,6 +113,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * The cached value of the '{@link #getChildNode() <em>Child Node</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getChildNode()

 	 * @generated

 	 * @ordered

@@ -117,6 +122,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeatureImpl() {

@@ -126,6 +132,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTime basicGetActualBindingTime() {

@@ -135,6 +142,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EADatatypePrototype basicGetFeatureParameter() {

@@ -144,18 +152,20 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setFeatureParameter(EADatatypePrototype newFeatureParameter) {

 		EADatatypePrototype oldFeatureParameter = featureParameter;

 		featureParameter = newFeatureParameter;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER, oldFeatureParameter, featureParameter));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTime basicGetRequiredBindingTime() {

@@ -164,87 +174,95 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE__BASE_CLASS:

-				if (resolve) return getBase_Class();

-				return basicGetBase_Class();

-			case FeaturemodelingPackage.FEATURE__CARDINALITY:

-				return getCardinality();

-			case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

-				if (resolve) return getRequiredBindingTime();

-				return basicGetRequiredBindingTime();

-			case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

-				if (resolve) return getActualBindingTime();

-				return basicGetActualBindingTime();

-			case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

-				if (resolve) return getFeatureParameter();

-				return basicGetFeatureParameter();

-			case FeaturemodelingPackage.FEATURE__CHILD_NODE:

-				return getChildNode();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE__BASE_CLASS:

+			if(resolve)

+				return getBase_Class();

+			return basicGetBase_Class();

+		case FeaturemodelingPackage.FEATURE__CARDINALITY:

+			return getCardinality();

+		case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

+			if(resolve)

+				return getRequiredBindingTime();

+			return basicGetRequiredBindingTime();

+		case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

+			if(resolve)

+				return getActualBindingTime();

+			return basicGetActualBindingTime();

+		case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

+			if(resolve)

+				return getFeatureParameter();

+			return basicGetFeatureParameter();

+		case FeaturemodelingPackage.FEATURE__CHILD_NODE:

+			return getChildNode();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE__BASE_CLASS:

-				return base_Class != null;

-			case FeaturemodelingPackage.FEATURE__CARDINALITY:

-				return CARDINALITY_EDEFAULT == null ? cardinality != null : !CARDINALITY_EDEFAULT.equals(cardinality);

-			case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

-				return requiredBindingTime != null;

-			case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

-				return actualBindingTime != null;

-			case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

-				return featureParameter != null;

-			case FeaturemodelingPackage.FEATURE__CHILD_NODE:

-				return childNode != null && !childNode.isEmpty();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE__BASE_CLASS:

+			return base_Class != null;

+		case FeaturemodelingPackage.FEATURE__CARDINALITY:

+			return CARDINALITY_EDEFAULT == null ? cardinality != null : !CARDINALITY_EDEFAULT.equals(cardinality);

+		case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

+			return requiredBindingTime != null;

+		case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

+			return actualBindingTime != null;

+		case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

+			return featureParameter != null;

+		case FeaturemodelingPackage.FEATURE__CHILD_NODE:

+			return childNode != null && !childNode.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE__CARDINALITY:

-				setCardinality((String)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

-				setRequiredBindingTime((BindingTime)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

-				setActualBindingTime((BindingTime)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

-				setFeatureParameter((EADatatypePrototype)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE__CHILD_NODE:

-				getChildNode().clear();

-				getChildNode().addAll((Collection<? extends FeatureTreeNode>)newValue);

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE__CARDINALITY:

+			setCardinality((String)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

+			setRequiredBindingTime((BindingTime)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

+			setActualBindingTime((BindingTime)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

+			setFeatureParameter((EADatatypePrototype)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE__CHILD_NODE:

+			getChildNode().clear();

+			getChildNode().addAll((Collection<? extends FeatureTreeNode>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -255,14 +273,15 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if (base_Class != null && base_Class.eIsProxy()) {

+		if(base_Class != null && base_Class.eIsProxy()) {

 			InternalEObject oldBase_Class = (InternalEObject)base_Class;

 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if (base_Class != oldBase_Class) {

-				if (eNotificationRequired())

+			if(base_Class != oldBase_Class) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE__BASE_CLASS, oldBase_Class, base_Class));

 			}

 		}

@@ -272,6 +291,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -281,54 +301,57 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE__BASE_CLASS, oldBase_Class, base_Class));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)null);

-				return;

-			case FeaturemodelingPackage.FEATURE__CARDINALITY:

-				setCardinality(CARDINALITY_EDEFAULT);

-				return;

-			case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

-				setRequiredBindingTime((BindingTime)null);

-				return;

-			case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

-				setActualBindingTime((BindingTime)null);

-				return;

-			case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

-				setFeatureParameter((EADatatypePrototype)null);

-				return;

-			case FeaturemodelingPackage.FEATURE__CHILD_NODE:

-				getChildNode().clear();

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			return;

+		case FeaturemodelingPackage.FEATURE__CARDINALITY:

+			setCardinality(CARDINALITY_EDEFAULT);

+			return;

+		case FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME:

+			setRequiredBindingTime((BindingTime)null);

+			return;

+		case FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME:

+			setActualBindingTime((BindingTime)null);

+			return;

+		case FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER:

+			setFeatureParameter((EADatatypePrototype)null);

+			return;

+		case FeaturemodelingPackage.FEATURE__CHILD_NODE:

+			getChildNode().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTime getActualBindingTime() {

-		if (actualBindingTime != null && actualBindingTime.eIsProxy()) {

+		if(actualBindingTime != null && actualBindingTime.eIsProxy()) {

 			InternalEObject oldActualBindingTime = (InternalEObject)actualBindingTime;

 			actualBindingTime = (BindingTime)eResolveProxy(oldActualBindingTime);

-			if (actualBindingTime != oldActualBindingTime) {

-				if (eNotificationRequired())

+			if(actualBindingTime != oldActualBindingTime) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME, oldActualBindingTime, actualBindingTime));

 			}

 		}

@@ -337,6 +360,7 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getCardinality() {

@@ -345,10 +369,11 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<FeatureTreeNode> getChildNode() {

-		if (childNode == null) {

+		if(childNode == null) {

 			childNode = new EObjectResolvingEList<FeatureTreeNode>(FeatureTreeNode.class, this, FeaturemodelingPackage.FEATURE__CHILD_NODE);

 		}

 		return childNode;

@@ -356,14 +381,15 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EADatatypePrototype getFeatureParameter() {

-		if (featureParameter != null && featureParameter.eIsProxy()) {

+		if(featureParameter != null && featureParameter.eIsProxy()) {

 			InternalEObject oldFeatureParameter = (InternalEObject)featureParameter;

 			featureParameter = (EADatatypePrototype)eResolveProxy(oldFeatureParameter);

-			if (featureParameter != oldFeatureParameter) {

-				if (eNotificationRequired())

+			if(featureParameter != oldFeatureParameter) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE__FEATURE_PARAMETER, oldFeatureParameter, featureParameter));

 			}

 		}

@@ -372,14 +398,15 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTime getRequiredBindingTime() {

-		if (requiredBindingTime != null && requiredBindingTime.eIsProxy()) {

+		if(requiredBindingTime != null && requiredBindingTime.eIsProxy()) {

 			InternalEObject oldRequiredBindingTime = (InternalEObject)requiredBindingTime;

 			requiredBindingTime = (BindingTime)eResolveProxy(oldRequiredBindingTime);

-			if (requiredBindingTime != oldRequiredBindingTime) {

-				if (eNotificationRequired())

+			if(requiredBindingTime != oldRequiredBindingTime) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME, oldRequiredBindingTime, requiredBindingTime));

 			}

 		}

@@ -388,44 +415,49 @@ public class FeatureImpl extends FeatureTreeNodeImpl implements Feature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setActualBindingTime(BindingTime newActualBindingTime) {

 		BindingTime oldActualBindingTime = actualBindingTime;

 		actualBindingTime = newActualBindingTime;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE__ACTUAL_BINDING_TIME, oldActualBindingTime, actualBindingTime));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setCardinality(String newCardinality) {

 		String oldCardinality = cardinality;

 		cardinality = newCardinality;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE__CARDINALITY, oldCardinality, cardinality));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setRequiredBindingTime(BindingTime newRequiredBindingTime) {

 		BindingTime oldRequiredBindingTime = requiredBindingTime;

 		requiredBindingTime = newRequiredBindingTime;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE__REQUIRED_BINDING_TIME, oldRequiredBindingTime, requiredBindingTime));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (cardinality: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureLinkImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureLinkImpl.java
index 813875f1fc3..9129d96b704 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureLinkImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureLinkImpl.java
@@ -34,16 +34,16 @@ import org.eclipse.uml2.uml.Dependency;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#isIsBidirectional <em>Is Bidirectional</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getCustomType <em>Custom Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getBase_Dependency <em>Base Dependency</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getStart <em>Start</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getEnd <em>End</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getBase_AssociationClass <em>Base Association Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getKind <em>Kind</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#isIsBidirectional <em>Is Bidirectional</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getCustomType <em>Custom Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getBase_Dependency <em>Base Dependency</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getStart <em>Start</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getEnd <em>End</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getBase_AssociationClass <em>Base Association Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureLinkImpl#getKind <em>Kind</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {

@@ -51,6 +51,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * The default value of the '{@link #isIsBidirectional() <em>Is Bidirectional</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #isIsBidirectional()

 	 * @generated

 	 * @ordered

@@ -60,6 +61,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * The cached value of the '{@link #isIsBidirectional() <em>Is Bidirectional</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #isIsBidirectional()

 	 * @generated

 	 * @ordered

@@ -90,6 +92,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Dependency()

 	 * @generated

 	 * @ordered

@@ -100,6 +103,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The cached value of the '{@link #getStart() <em>Start</em>}' reference.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @see #getStart()

 	 * @generated

 	 * @ordered

@@ -110,6 +114,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The cached value of the '{@link #getEnd() <em>End</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getEnd()

 	 * @generated

 	 * @ordered

@@ -120,6 +125,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The cached value of the '{@link #getBase_AssociationClass() <em>Base Association Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_AssociationClass()

 	 * @generated

 	 * @ordered

@@ -130,6 +136,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -140,6 +147,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -148,6 +156,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeatureLinkImpl() {

@@ -156,6 +165,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Feature basicGetEnd() {

@@ -164,6 +174,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Feature basicGetStart() {

@@ -172,92 +183,100 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

-				return isIsBidirectional();

-			case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

-				return getCustomType();

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

-				if (resolve) return getBase_Dependency();

-				return basicGetBase_Dependency();

-			case FeaturemodelingPackage.FEATURE_LINK__START:

-				if (resolve) return getStart();

-				return basicGetStart();

-			case FeaturemodelingPackage.FEATURE_LINK__END:

-				if (resolve) return getEnd();

-				return basicGetEnd();

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

-				if (resolve) return getBase_AssociationClass();

-				return basicGetBase_AssociationClass();

-			case FeaturemodelingPackage.FEATURE_LINK__KIND:

-				return getKind();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

+			return isIsBidirectional();

+		case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

+			return getCustomType();

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

+			if(resolve)

+				return getBase_Dependency();

+			return basicGetBase_Dependency();

+		case FeaturemodelingPackage.FEATURE_LINK__START:

+			if(resolve)

+				return getStart();

+			return basicGetStart();

+		case FeaturemodelingPackage.FEATURE_LINK__END:

+			if(resolve)

+				return getEnd();

+			return basicGetEnd();

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

+			if(resolve)

+				return getBase_AssociationClass();

+			return basicGetBase_AssociationClass();

+		case FeaturemodelingPackage.FEATURE_LINK__KIND:

+			return getKind();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

-				return isBidirectional != IS_BIDIRECTIONAL_EDEFAULT;

-			case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

-				return CUSTOM_TYPE_EDEFAULT == null ? customType != null : !CUSTOM_TYPE_EDEFAULT.equals(customType);

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

-				return base_Dependency != null;

-			case FeaturemodelingPackage.FEATURE_LINK__START:

-				return start != null;

-			case FeaturemodelingPackage.FEATURE_LINK__END:

-				return end != null;

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

-				return base_AssociationClass != null;

-			case FeaturemodelingPackage.FEATURE_LINK__KIND:

-				return kind != KIND_EDEFAULT;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

+			return isBidirectional != IS_BIDIRECTIONAL_EDEFAULT;

+		case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

+			return CUSTOM_TYPE_EDEFAULT == null ? customType != null : !CUSTOM_TYPE_EDEFAULT.equals(customType);

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

+			return base_Dependency != null;

+		case FeaturemodelingPackage.FEATURE_LINK__START:

+			return start != null;

+		case FeaturemodelingPackage.FEATURE_LINK__END:

+			return end != null;

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

+			return base_AssociationClass != null;

+		case FeaturemodelingPackage.FEATURE_LINK__KIND:

+			return kind != KIND_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

-				setIsBidirectional((Boolean)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

-				setCustomType((String)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

-				setBase_Dependency((Dependency)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__START:

-				setStart((Feature)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__END:

-				setEnd((Feature)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

-				setBase_AssociationClass((AssociationClass)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__KIND:

-				setKind((VariabilityDependencyKind)newValue);

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

+			setIsBidirectional((Boolean)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

+			setCustomType((String)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

+			setBase_Dependency((Dependency)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__START:

+			setStart((Feature)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__END:

+			setEnd((Feature)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

+			setBase_AssociationClass((AssociationClass)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__KIND:

+			setKind((VariabilityDependencyKind)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -267,38 +286,40 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

-				setIsBidirectional(IS_BIDIRECTIONAL_EDEFAULT);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

-				setCustomType(CUSTOM_TYPE_EDEFAULT);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

-				setBase_Dependency((Dependency)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__START:

-				setStart((Feature)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__END:

-				setEnd((Feature)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

-				setBase_AssociationClass((AssociationClass)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_LINK__KIND:

-				setKind(KIND_EDEFAULT);

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL:

+			setIsBidirectional(IS_BIDIRECTIONAL_EDEFAULT);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE:

+			setCustomType(CUSTOM_TYPE_EDEFAULT);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY:

+			setBase_Dependency((Dependency)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__START:

+			setStart((Feature)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__END:

+			setEnd((Feature)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS:

+			setBase_AssociationClass((AssociationClass)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_LINK__KIND:

+			setKind(KIND_EDEFAULT);

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getCustomType() {

@@ -307,14 +328,15 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Feature getEnd() {

-		if (end != null && end.eIsProxy()) {

+		if(end != null && end.eIsProxy()) {

 			InternalEObject oldEnd = (InternalEObject)end;

 			end = (Feature)eResolveProxy(oldEnd);

-			if (end != oldEnd) {

-				if (eNotificationRequired())

+			if(end != oldEnd) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_LINK__END, oldEnd, end));

 			}

 		}

@@ -323,6 +345,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityDependencyKind getKind() {

@@ -331,14 +354,15 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Feature getStart() {

-		if (start != null && start.eIsProxy()) {

+		if(start != null && start.eIsProxy()) {

 			InternalEObject oldStart = (InternalEObject)start;

 			start = (Feature)eResolveProxy(oldStart);

-			if (start != oldStart) {

-				if (eNotificationRequired())

+			if(start != oldStart) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_LINK__START, oldStart, start));

 			}

 		}

@@ -347,6 +371,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public boolean isIsBidirectional() {

@@ -355,26 +380,28 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setCustomType(String newCustomType) {

 		String oldCustomType = customType;

 		customType = newCustomType;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__CUSTOM_TYPE, oldCustomType, customType));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Dependency getBase_Dependency() {

-		if (base_Dependency != null && base_Dependency.eIsProxy()) {

+		if(base_Dependency != null && base_Dependency.eIsProxy()) {

 			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;

 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);

-			if (base_Dependency != oldBase_Dependency) {

-				if (eNotificationRequired())

+			if(base_Dependency != oldBase_Dependency) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

 			}

 		}

@@ -384,6 +411,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Dependency basicGetBase_Dependency() {

@@ -393,37 +421,40 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Dependency(Dependency newBase_Dependency) {

 		Dependency oldBase_Dependency = base_Dependency;

 		base_Dependency = newBase_Dependency;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setEnd(Feature newEnd) {

 		Feature oldEnd = end;

 		end = newEnd;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__END, oldEnd, end));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AssociationClass getBase_AssociationClass() {

-		if (base_AssociationClass != null && base_AssociationClass.eIsProxy()) {

+		if(base_AssociationClass != null && base_AssociationClass.eIsProxy()) {

 			InternalEObject oldBase_AssociationClass = (InternalEObject)base_AssociationClass;

 			base_AssociationClass = (AssociationClass)eResolveProxy(oldBase_AssociationClass);

-			if (base_AssociationClass != oldBase_AssociationClass) {

-				if (eNotificationRequired())

+			if(base_AssociationClass != oldBase_AssociationClass) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS, oldBase_AssociationClass, base_AssociationClass));

 			}

 		}

@@ -433,6 +464,7 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AssociationClass basicGetBase_AssociationClass() {

@@ -442,55 +474,61 @@ public class FeatureLinkImpl extends RelationshipImpl implements FeatureLink {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_AssociationClass(AssociationClass newBase_AssociationClass) {

 		AssociationClass oldBase_AssociationClass = base_AssociationClass;

 		base_AssociationClass = newBase_AssociationClass;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__BASE_ASSOCIATION_CLASS, oldBase_AssociationClass, base_AssociationClass));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setIsBidirectional(boolean newIsBidirectional) {

 		boolean oldIsBidirectional = isBidirectional;

 		isBidirectional = newIsBidirectional;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__IS_BIDIRECTIONAL, oldIsBidirectional, isBidirectional));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setKind(VariabilityDependencyKind newKind) {

 		VariabilityDependencyKind oldKind = kind;

 		kind = newKind == null ? KIND_EDEFAULT : newKind;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__KIND, oldKind, kind));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setStart(Feature newStart) {

 		Feature oldStart = start;

 		start = newStart;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_LINK__START, oldStart, start));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (isBidirectional: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureModelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureModelImpl.java
index 33b4603e5a2..989c81dacac 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureModelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureModelImpl.java
@@ -37,14 +37,14 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getBase_Package <em>Base Package</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getRootFeature <em>Root Feature</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getFeatureLink <em>Feature Link</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getFeatureConstraint <em>Feature Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getRootFeature <em>Root Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getFeatureLink <em>Feature Link</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.impl.FeatureModelImpl#getFeatureConstraint <em>Feature Constraint</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class FeatureModelImpl extends ContextImpl implements FeatureModel {

@@ -53,6 +53,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Package()

 	 * @generated

 	 * @ordered

@@ -63,6 +64,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -72,6 +74,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * The cached value of the '{@link #getRootFeature() <em>Root Feature</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getRootFeature()

 	 * @generated

 	 * @ordered

@@ -81,6 +84,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * The cached value of the '{@link #getFeatureLink() <em>Feature Link</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getFeatureLink()

 	 * @generated

 	 * @ordered

@@ -90,6 +94,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * The cached value of the '{@link #getFeatureConstraint() <em>Feature Constraint</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getFeatureConstraint()

 	 * @generated

 	 * @ordered

@@ -98,6 +103,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeatureModelImpl() {

@@ -106,80 +112,86 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

-				if (resolve) return getBase_Package();

-				return basicGetBase_Package();

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

-				if (resolve) return getBase_Class();

-				return basicGetBase_Class();

-			case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

-				return getRootFeature();

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

-				return getFeatureLink();

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

-				return getFeatureConstraint();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

+			if(resolve)

+				return getBase_Package();

+			return basicGetBase_Package();

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

+			if(resolve)

+				return getBase_Class();

+			return basicGetBase_Class();

+		case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

+			return getRootFeature();

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

+			return getFeatureLink();

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

+			return getFeatureConstraint();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

-				return base_Package != null;

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

-				return base_Class != null;

-			case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

-				return rootFeature != null && !rootFeature.isEmpty();

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

-				return featureLink != null && !featureLink.isEmpty();

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

-				return featureConstraint != null && !featureConstraint.isEmpty();

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

+			return base_Package != null;

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

+			return base_Class != null;

+		case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

+			return rootFeature != null && !rootFeature.isEmpty();

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

+			return featureLink != null && !featureLink.isEmpty();

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

+			return featureConstraint != null && !featureConstraint.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

-				getRootFeature().clear();

-				getRootFeature().addAll((Collection<? extends Feature>)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

-				getFeatureLink().clear();

-				getFeatureLink().addAll((Collection<? extends FeatureLink>)newValue);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

-				getFeatureConstraint().clear();

-				getFeatureConstraint().addAll((Collection<? extends FeatureConstraint>)newValue);

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

+			getRootFeature().clear();

+			getRootFeature().addAll((Collection<? extends Feature>)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

+			getFeatureLink().clear();

+			getFeatureLink().addAll((Collection<? extends FeatureLink>)newValue);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

+			getFeatureConstraint().clear();

+			getFeatureConstraint().addAll((Collection<? extends FeatureConstraint>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -190,14 +202,15 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package getBase_Package() {

-		if (base_Package != null && base_Package.eIsProxy()) {

+		if(base_Package != null && base_Package.eIsProxy()) {

 			InternalEObject oldBase_Package = (InternalEObject)base_Package;

 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);

-			if (base_Package != oldBase_Package) {

-				if (eNotificationRequired())

+			if(base_Package != oldBase_Package) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));

 			}

 		}

@@ -207,6 +220,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {

@@ -216,26 +230,28 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {

 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;

 		base_Package = newBase_Package;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if (base_Class != null && base_Class.eIsProxy()) {

+		if(base_Class != null && base_Class.eIsProxy()) {

 			InternalEObject oldBase_Class = (InternalEObject)base_Class;

 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if (base_Class != oldBase_Class) {

-				if (eNotificationRequired())

+			if(base_Class != oldBase_Class) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS, oldBase_Class, base_Class));

 			}

 		}

@@ -245,6 +261,7 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -254,47 +271,50 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS, oldBase_Class, base_Class));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

-				setBase_Package((org.eclipse.uml2.uml.Package)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)null);

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

-				getRootFeature().clear();

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

-				getFeatureLink().clear();

-				return;

-			case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

-				getFeatureConstraint().clear();

-				return;

+		switch(featureID) {

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_PACKAGE:

+			setBase_Package((org.eclipse.uml2.uml.Package)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE:

+			getRootFeature().clear();

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK:

+			getFeatureLink().clear();

+			return;

+		case FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT:

+			getFeatureConstraint().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<FeatureConstraint> getFeatureConstraint() {

-		if (featureConstraint == null) {

+		if(featureConstraint == null) {

 			featureConstraint = new EObjectResolvingEList<FeatureConstraint>(FeatureConstraint.class, this, FeaturemodelingPackage.FEATURE_MODEL__FEATURE_CONSTRAINT);

 		}

 		return featureConstraint;

@@ -302,10 +322,11 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<FeatureLink> getFeatureLink() {

-		if (featureLink == null) {

+		if(featureLink == null) {

 			featureLink = new EObjectResolvingEList<FeatureLink>(FeatureLink.class, this, FeaturemodelingPackage.FEATURE_MODEL__FEATURE_LINK);

 		}

 		return featureLink;

@@ -313,10 +334,11 @@ public class FeatureModelImpl extends ContextImpl implements FeatureModel {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<Feature> getRootFeature() {

-		if (rootFeature == null) {

+		if(rootFeature == null) {

 			rootFeature = new EObjectResolvingEList<Feature>(Feature.class, this, FeaturemodelingPackage.FEATURE_MODEL__ROOT_FEATURE);

 		}

 		return rootFeature;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureTreeNodeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureTreeNodeImpl.java
index df5536395f4..9e1938c23f5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureTreeNodeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeatureTreeNodeImpl.java
@@ -22,17 +22,17 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Feature Tree Node</b></em>

- * '. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Feature Tree Node</b></em> '. <!-- end-user-doc -->

  * <p>

  * </p>

- *

+ * 

  * @generated

  */

 public abstract class FeatureTreeNodeImpl extends ContextImpl implements FeatureTreeNode {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeatureTreeNodeImpl() {

@@ -41,6 +41,7 @@ public abstract class FeatureTreeNodeImpl extends ContextImpl implements Feature
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingFactoryImpl.java
index 14f66f33c46..8b38f338680 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.structure.featuremodeling.*;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTimeKind;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;

@@ -35,12 +36,14 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependen
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FeaturemodelingFactoryImpl extends EFactoryImpl implements FeaturemodelingFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -52,16 +55,16 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static FeaturemodelingFactory init() {

 		try {

 			FeaturemodelingFactory theFeaturemodelingFactory = (FeaturemodelingFactory)EPackage.Registry.INSTANCE.getEFactory(FeaturemodelingPackage.eNS_URI);

-			if (theFeaturemodelingFactory != null) {

+			if(theFeaturemodelingFactory != null) {

 				return theFeaturemodelingFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new FeaturemodelingFactoryImpl();

@@ -70,6 +73,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingFactoryImpl() {

@@ -78,6 +82,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertBindingTimeKindToString(EDataType eDataType, Object instanceValue) {

@@ -86,23 +91,25 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case FeaturemodelingPackage.BINDING_TIME_KIND:

-				return convertBindingTimeKindToString(eDataType, instanceValue);

-			case FeaturemodelingPackage.VARIABILITY_DEPENDENCY_KIND:

-				return convertVariabilityDependencyKindToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case FeaturemodelingPackage.BINDING_TIME_KIND:

+			return convertBindingTimeKindToString(eDataType, instanceValue);

+		case FeaturemodelingPackage.VARIABILITY_DEPENDENCY_KIND:

+			return convertVariabilityDependencyKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertVariabilityDependencyKindToString(EDataType eDataType, Object instanceValue) {

@@ -111,24 +118,32 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case FeaturemodelingPackage.FEATURE_MODEL: return createFeatureModel();

-			case FeaturemodelingPackage.FEATURE: return createFeature();

-			case FeaturemodelingPackage.BINDING_TIME: return createBindingTime();

-			case FeaturemodelingPackage.FEATURE_LINK: return createFeatureLink();

-			case FeaturemodelingPackage.FEATURE_CONSTRAINT: return createFeatureConstraint();

-			case FeaturemodelingPackage.FEATURE_GROUP: return createFeatureGroup();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case FeaturemodelingPackage.FEATURE_MODEL:

+			return createFeatureModel();

+		case FeaturemodelingPackage.FEATURE:

+			return createFeature();

+		case FeaturemodelingPackage.BINDING_TIME:

+			return createBindingTime();

+		case FeaturemodelingPackage.FEATURE_LINK:

+			return createFeatureLink();

+		case FeaturemodelingPackage.FEATURE_CONSTRAINT:

+			return createFeatureConstraint();

+		case FeaturemodelingPackage.FEATURE_GROUP:

+			return createFeatureGroup();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTime createBindingTime() {

@@ -138,16 +153,19 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BindingTimeKind createBindingTimeKindFromString(EDataType eDataType, String initialValue) {

 		BindingTimeKind result = BindingTimeKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Feature createFeature() {

@@ -157,6 +175,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeatureConstraint createFeatureConstraint() {

@@ -166,6 +185,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeatureGroup createFeatureGroup() {

@@ -175,6 +195,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeatureLink createFeatureLink() {

@@ -185,6 +206,7 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeatureModel createFeatureModel() {

@@ -194,33 +216,37 @@ public class FeaturemodelingFactoryImpl extends EFactoryImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case FeaturemodelingPackage.BINDING_TIME_KIND:

-				return createBindingTimeKindFromString(eDataType, initialValue);

-			case FeaturemodelingPackage.VARIABILITY_DEPENDENCY_KIND:

-				return createVariabilityDependencyKindFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case FeaturemodelingPackage.BINDING_TIME_KIND:

+			return createBindingTimeKindFromString(eDataType, initialValue);

+		case FeaturemodelingPackage.VARIABILITY_DEPENDENCY_KIND:

+			return createVariabilityDependencyKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityDependencyKind createVariabilityDependencyKindFromString(EDataType eDataType, String initialValue) {

 		VariabilityDependencyKind result = VariabilityDependencyKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingPackage getFeaturemodelingPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingPackageImpl.java
index 7dd9ec91a02..6e5deff715d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/impl/FeaturemodelingPackageImpl.java
@@ -93,12 +93,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FeaturemodelingPackageImpl extends EPackageImpl implements FeaturemodelingPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -106,16 +108,18 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * 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 FeaturemodelingPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link FeaturemodelingPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static FeaturemodelingPackage init() {

-		if (isInited) return (FeaturemodelingPackage)EPackage.Registry.INSTANCE.getEPackage(FeaturemodelingPackage.eNS_URI);

+		if(isInited)

+			return (FeaturemodelingPackage)EPackage.Registry.INSTANCE.getEPackage(FeaturemodelingPackage.eNS_URI);

 

 		// Obtain or create and register package

 		FeaturemodelingPackageImpl theFeaturemodelingPackage = (FeaturemodelingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FeaturemodelingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FeaturemodelingPackageImpl());

@@ -217,7 +221,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 		// Mark meta-data to indicate it can't be changed

 		theFeaturemodelingPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(FeaturemodelingPackage.eNS_URI, theFeaturemodelingPackage);

 		return theFeaturemodelingPackage;

@@ -225,48 +229,56 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureModelEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureLinkEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureTreeNodeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass bindingTimeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureGroupEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureConstraintEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum bindingTimeKindEEnum = null;

@@ -274,31 +286,33 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum variabilityDependencyKindEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#eNS_URI

 	 * @see #init()

@@ -309,13 +323,15 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -366,6 +382,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getBindingTime() {

@@ -374,6 +391,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getBindingTime_Kind() {

@@ -383,6 +401,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getBindingTime_Base_Class() {

@@ -391,6 +410,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getBindingTimeKind() {

@@ -399,6 +419,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeature() {

@@ -408,6 +429,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeature_Base_Class() {

@@ -416,6 +438,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeature_ActualBindingTime() {

@@ -424,6 +447,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeature_Cardinality() {

@@ -433,6 +457,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeature_ChildNode() {

@@ -442,6 +467,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeature_FeatureParameter() {

@@ -450,6 +476,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeature_RequiredBindingTime() {

@@ -458,6 +485,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureConstraint() {

@@ -466,6 +494,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeatureConstraint_Criterion() {

@@ -475,6 +504,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureConstraint_Base_Class() {

@@ -484,6 +514,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureConstraint_Base_Constraint() {

@@ -492,6 +523,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureGroup() {

@@ -501,6 +533,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureGroup_Base_Class() {

@@ -509,6 +542,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeatureGroup_Cardinality() {

@@ -518,6 +552,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureGroup_ChildFeature() {

@@ -526,6 +561,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureLink() {

@@ -535,6 +571,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeatureLink_CustomType() {

@@ -544,6 +581,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureLink_Base_Dependency() {

@@ -552,6 +590,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureLink_End() {

@@ -561,6 +600,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureLink_Base_AssociationClass() {

@@ -569,6 +609,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeatureLink_IsBidirectional() {

@@ -578,6 +619,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFeatureLink_Kind() {

@@ -586,6 +628,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureLink_Start() {

@@ -594,6 +637,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureModel() {

@@ -603,6 +647,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureModel_Base_Package() {

@@ -612,6 +657,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureModel_Base_Class() {

@@ -621,6 +667,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureModel_FeatureConstraint() {

@@ -630,6 +677,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureModel_FeatureLink() {

@@ -639,6 +687,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureModel_RootFeature() {

@@ -647,6 +696,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingFactory getFeaturemodelingFactory() {

@@ -655,6 +705,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureTreeNode() {

@@ -664,6 +715,7 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getVariabilityDependencyKind() {

@@ -671,13 +723,15 @@ public class FeaturemodelingPackageImpl extends EPackageImpl implements Featurem
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingAdapterFactory.java
index f8154985c3a..979de7fee87 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingAdapterFactory.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;

+import org.eclipse.papyrus.eastadl.structure.featuremodeling.*;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint;

@@ -33,8 +34,9 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
 

 

 /**

- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage

  * @generated

  */

@@ -43,6 +45,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static FeaturemodelingPackage modelPackage;

@@ -51,62 +54,75 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FeaturemodelingSwitch<Adapter> modelSwitch = new FeaturemodelingSwitch<Adapter>() {

-			@Override

-			public Adapter caseFeatureModel(FeatureModel object) {

-				return createFeatureModelAdapter();

-			}

-			@Override

-			public Adapter caseFeature(Feature object) {

-				return createFeatureAdapter();

-			}

-			@Override

-			public Adapter caseFeatureTreeNode(FeatureTreeNode object) {

-				return createFeatureTreeNodeAdapter();

-			}

-			@Override

-			public Adapter caseBindingTime(BindingTime object) {

-				return createBindingTimeAdapter();

-			}

-			@Override

-			public Adapter caseFeatureLink(FeatureLink object) {

-				return createFeatureLinkAdapter();

-			}

-			@Override

-			public Adapter caseFeatureConstraint(FeatureConstraint object) {

-				return createFeatureConstraintAdapter();

-			}

-			@Override

-			public Adapter caseFeatureGroup(FeatureGroup object) {

-				return createFeatureGroupAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter caseRelationship(Relationship object) {

-				return createRelationshipAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseFeatureModel(FeatureModel object) {

+			return createFeatureModelAdapter();

+		}

+

+		@Override

+		public Adapter caseFeature(Feature object) {

+			return createFeatureAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureTreeNode(FeatureTreeNode object) {

+			return createFeatureTreeNodeAdapter();

+		}

+

+		@Override

+		public Adapter caseBindingTime(BindingTime object) {

+			return createBindingTimeAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureLink(FeatureLink object) {

+			return createFeatureLinkAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureConstraint(FeatureConstraint object) {

+			return createFeatureConstraintAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureGroup(FeatureGroup object) {

+			return createFeatureGroupAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter caseRelationship(Relationship object) {

+			return createRelationshipAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = FeaturemodelingPackage.eINSTANCE;

 		}

 	}

@@ -114,7 +130,9 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -128,6 +146,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

 	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime

 	 * @generated

@@ -142,6 +161,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -154,6 +174,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -166,6 +187,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

 	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature

 	 * @generated

@@ -175,10 +197,12 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint <em>Feature Constraint</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint

+	 * <em>Feature Constraint</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint

 	 * @generated

@@ -188,10 +212,12 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup <em>Feature Group</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup <em>Feature Group</em>}

+	 * '.

 	 * <!-- begin-user-doc --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

 	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureGroup

 	 * @generated

@@ -206,6 +232,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -219,6 +246,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

 	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink

 	 * @generated

@@ -228,10 +256,12 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel <em>Feature Model</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel <em>Feature Model</em>}

+	 * '.

 	 * <!-- begin-user-doc --> This default implementation returns null so

 	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

 	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel

 	 * @generated

@@ -241,10 +271,12 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode <em>Feature Tree Node</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode

+	 * <em>Feature Tree Node</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode

 	 * @generated

@@ -259,6 +291,7 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship

 	 * @generated

@@ -272,15 +305,16 @@ public class FeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceFactoryImpl.java
index 9b65c253565..221f0942c17 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.util.FeaturemodelingResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class FeaturemodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class FeaturemodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceImpl.java
index e0f01bec67e..f27ca9c6b6e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.util.FeaturemodelingResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class FeaturemodelingResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public FeaturemodelingResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingSwitch.java
index 1090630d641..6fef7140c9b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingSwitch.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.Relationship;

+import org.eclipse.papyrus.eastadl.structure.featuremodeling.*;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.BindingTime;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint;

@@ -37,6 +38,7 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage

  * @generated

  */

@@ -45,6 +47,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static FeaturemodelingPackage modelPackage;

@@ -52,10 +55,11 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingSwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = FeaturemodelingPackage.eINSTANCE;

 		}

 	}

@@ -64,6 +68,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -79,7 +84,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Binding Time</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -94,7 +99,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -109,7 +116,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -122,7 +129,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Feature Constraint</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Constraint</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -135,7 +144,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Feature Group</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -150,7 +161,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -165,7 +178,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Link</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -178,7 +191,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Feature Model</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Model</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -191,7 +206,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Feature Tree Node</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Tree Node</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -206,7 +223,9 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Relationship</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -221,7 +240,7 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -234,69 +253,99 @@ public class FeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case FeaturemodelingPackage.FEATURE_MODEL: {

-				FeatureModel featureModel = (FeatureModel)theEObject;

-				T result = caseFeatureModel(featureModel);

-				if (result == null) result = caseContext(featureModel);

-				if (result == null) result = caseEAElement(featureModel);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.FEATURE: {

-				Feature feature = (Feature)theEObject;

-				T result = caseFeature(feature);

-				if (result == null) result = caseFeatureTreeNode(feature);

-				if (result == null) result = caseContext(feature);

-				if (result == null) result = caseEAElement(feature);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.FEATURE_TREE_NODE: {

-				FeatureTreeNode featureTreeNode = (FeatureTreeNode)theEObject;

-				T result = caseFeatureTreeNode(featureTreeNode);

-				if (result == null) result = caseContext(featureTreeNode);

-				if (result == null) result = caseEAElement(featureTreeNode);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.BINDING_TIME: {

-				BindingTime bindingTime = (BindingTime)theEObject;

-				T result = caseBindingTime(bindingTime);

-				if (result == null) result = caseEAElement(bindingTime);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.FEATURE_LINK: {

-				FeatureLink featureLink = (FeatureLink)theEObject;

-				T result = caseFeatureLink(featureLink);

-				if (result == null) result = caseRelationship(featureLink);

-				if (result == null) result = caseEAElement(featureLink);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.FEATURE_CONSTRAINT: {

-				FeatureConstraint featureConstraint = (FeatureConstraint)theEObject;

-				T result = caseFeatureConstraint(featureConstraint);

-				if (result == null) result = caseEAElement(featureConstraint);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FeaturemodelingPackage.FEATURE_GROUP: {

-				FeatureGroup featureGroup = (FeatureGroup)theEObject;

-				T result = caseFeatureGroup(featureGroup);

-				if (result == null) result = caseFeatureTreeNode(featureGroup);

-				if (result == null) result = caseContext(featureGroup);

-				if (result == null) result = caseEAElement(featureGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case FeaturemodelingPackage.FEATURE_MODEL:

+		{

+			FeatureModel featureModel = (FeatureModel)theEObject;

+			T result = caseFeatureModel(featureModel);

+			if(result == null)

+				result = caseContext(featureModel);

+			if(result == null)

+				result = caseEAElement(featureModel);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.FEATURE:

+		{

+			Feature feature = (Feature)theEObject;

+			T result = caseFeature(feature);

+			if(result == null)

+				result = caseFeatureTreeNode(feature);

+			if(result == null)

+				result = caseContext(feature);

+			if(result == null)

+				result = caseEAElement(feature);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.FEATURE_TREE_NODE:

+		{

+			FeatureTreeNode featureTreeNode = (FeatureTreeNode)theEObject;

+			T result = caseFeatureTreeNode(featureTreeNode);

+			if(result == null)

+				result = caseContext(featureTreeNode);

+			if(result == null)

+				result = caseEAElement(featureTreeNode);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.BINDING_TIME:

+		{

+			BindingTime bindingTime = (BindingTime)theEObject;

+			T result = caseBindingTime(bindingTime);

+			if(result == null)

+				result = caseEAElement(bindingTime);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.FEATURE_LINK:

+		{

+			FeatureLink featureLink = (FeatureLink)theEObject;

+			T result = caseFeatureLink(featureLink);

+			if(result == null)

+				result = caseRelationship(featureLink);

+			if(result == null)

+				result = caseEAElement(featureLink);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.FEATURE_CONSTRAINT:

+		{

+			FeatureConstraint featureConstraint = (FeatureConstraint)theEObject;

+			T result = caseFeatureConstraint(featureConstraint);

+			if(result == null)

+				result = caseEAElement(featureConstraint);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FeaturemodelingPackage.FEATURE_GROUP:

+		{

+			FeatureGroup featureGroup = (FeatureGroup)theEObject;

+			T result = caseFeatureGroup(featureGroup);

+			if(result == null)

+				result = caseFeatureTreeNode(featureGroup);

+			if(result == null)

+				result = caseContext(featureGroup);

+			if(result == null)

+				result = caseEAElement(featureGroup);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingXMLProcessor.java
index 7b42a0dd7e3..eb3ad92596c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/util/FeaturemodelingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPack
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FeaturemodelingXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class FeaturemodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeaturemodelingXMLProcessor() {

@@ -44,11 +46,12 @@ public class FeaturemodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Register for "*" and "xml" file extensions the FeaturemodelingResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new FeaturemodelingResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new FeaturemodelingResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AllocateableElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AllocateableElement.java
index 01f52f5973a..20b2d7a869d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AllocateableElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AllocateableElement.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Allocateable Element</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The AllocateableElement is an abstract superclass for elements that are allocateable.
  * 
@@ -31,8 +31,8 @@ import org.eclipse.emf.ecore.EObject;
  * 
  * Extension: abstract, no extension
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAllocateableElement()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Allocation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Allocation.java
index 2666673dd28..7f88f227cb4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Allocation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Allocation.java
@@ -23,38 +23,40 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Allocation</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Allocation element contains functionAllocations. It can bundle functionAllocations that belong together, e.g., all functionAllocations for a simulation.
+ * The Allocation element contains functionAllocations. It can bundle functionAllocations that belong together, e.g., all functionAllocations for a
+ * simulation.
  * 
  * Semantics:
  * The Allocation element contains functionAllocations, i.e., it can bundle functionAllocations that belong together.
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getFunctionAllocation <em>Function Allocation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getFunctionAllocation <em>Function Allocation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAllocation()
  * @model
  * @generated
  */
 public interface Allocation extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAllocation_Base_Class()
@@ -67,7 +69,9 @@ public interface Allocation extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -77,10 +81,10 @@ public interface Allocation extends EAElement {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAllocation_Base_Package()
@@ -90,10 +94,13 @@ public interface Allocation extends EAElement {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -104,10 +111,11 @@ public interface Allocation extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Allocation</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Allocation</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Allocation</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAllocation_FunctionAllocation()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionPrototype.java
index 803908ab32a..982996c0833 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionPrototype.java
@@ -20,7 +20,7 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Analysis Function Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The AnalysisFunctionPrototype represents references to the occurrence of the AnalysisFunctionType that types it when it acts as a part.
  * 
@@ -34,27 +34,28 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * Extension:
  * UML Property, specialization of SysML::BlockProperty
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAnalysisFunctionPrototype()
  * @model
  * @generated
  */
 public interface AnalysisFunctionPrototype extends FunctionPrototype {
+
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAnalysisFunctionPrototype_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionType.java
index 3716bd22698..9a2426ab1d1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/AnalysisFunctionType.java
@@ -21,19 +21,28 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Analysis Function Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The AnalysisFunctionType is a concrete FunctionType and therefore inherits the elementary function properties from the abstract metaclass FunctionType. The AnalysisFunctionType is used to model the functional structure on AnalysisLevel. The syntax of AnalysisFunctionTypes is inspired from the type-prototype pattern used by AUTOSAR.
+ * The AnalysisFunctionType is a concrete FunctionType and therefore inherits the elementary function properties from the abstract metaclass
+ * FunctionType. The AnalysisFunctionType is used to model the functional structure on AnalysisLevel. The syntax of AnalysisFunctionTypes is inspired
+ * from the type-prototype pattern used by AUTOSAR.
  * 
  * The AnalysisFunctions may interact with other AnalysisFunctions (i.e., also FunctionalDevices) through their FunctionPorts.
  * 
- * Furthermore, an AnalysisFunction may be decomposed into (sub-)AnalysisFunctions. This allows breaking up hierarchically the functionalities provided by the parent AnalysisFunction into subfunctionalities.
+ * Furthermore, an AnalysisFunction may be decomposed into (sub-)AnalysisFunctions. This allows breaking up hierarchically the functionalities
+ * provided by the parent AnalysisFunction into subfunctionalities.
  * 
- * A FunctionBehavior may be associated with each AnalysisFunction. In the case where the AnalysisFunction is decomposed, the behavior is a specification for the composed behavior of the subAnalysisFunction. If the AnalysisFunction is not decomposed (i.e., if the AnalysisFunction is elementary), then the behavior is describing the behavior of the subAnalysisFunction, which is to be used when building the global behavior of the FunctionalAnalysisArchitecture by composition of the leaf behaviors.
+ * A FunctionBehavior may be associated with each AnalysisFunction. In the case where the AnalysisFunction is decomposed, the behavior is a
+ * specification for the composed behavior of the subAnalysisFunction. If the AnalysisFunction is not decomposed (i.e., if the AnalysisFunction is
+ * elementary), then the behavior is describing the behavior of the subAnalysisFunction, which is to be used when building the global behavior of the
+ * FunctionalAnalysisArchitecture by composition of the leaf behaviors.
  * 
  * 
  * Semantics:
- * The AnalysisFunctionType represents a node in a tree structure corresponding to the functional decomposition of a top level AnalysisFunction. The AnalysisFunction is representing the analysis function used to describe the functionalities provided by a vehicle on the AnalysisLevel. At the AnalysisLevel, AnalysisFunctions are defined and structured according to the functional requirements, i.e., the functionalities provided to the user. 
+ * The AnalysisFunctionType represents a node in a tree structure corresponding to the functional decomposition of a top level AnalysisFunction. The
+ * AnalysisFunction is representing the analysis function used to describe the functionalities provided by a vehicle on the AnalysisLevel. At the
+ * AnalysisLevel, AnalysisFunctions are defined and structured according to the functional requirements, i.e., the functionalities provided to the
+ * user.
  * 
  * Constraints:
  * [1] AnalysisFunctionTypes may only be used on AnalysisLevel.
@@ -41,28 +50,29 @@ import org.eclipse.emf.common.util.EList;
  * 
  * Extension: UML Class, specialization of SysML::Block
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType#getPart <em>Part</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAnalysisFunctionType()
  * @model
  * @generated
  */
 public interface AnalysisFunctionType extends FunctionType {
+
 	/**
 	 * Returns the value of the '<em><b>Part</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Part</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Part</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getAnalysisFunctionType_Part()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/BasicSoftwareFunctionType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/BasicSoftwareFunctionType.java
index 90596270efa..536d62f7eda 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/BasicSoftwareFunctionType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/BasicSoftwareFunctionType.java
@@ -20,18 +20,18 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Basic Software Function Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The BasicSoftwareFunctionType is an abstraction of middleware functionality.
  * 
  * Semantics:
  * The BasicSoftwareFunctionType is an abstraction of the middleware.
  * 
- * Extension: 
+ * Extension:
  * UML Class, specialization of SysML::Block
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getBasicSoftwareFunctionType()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/ClientServerKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/ClientServerKind.java
index 5300b880bd9..e43785935be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/ClientServerKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/ClientServerKind.java
@@ -32,9 +32,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * Semantics:
  * The ClientServerKind is an enumeration with the two literals "client" and "server".
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getClientServerKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum ClientServerKind implements Enumerator {
 	 * The '<em><b>Client</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CLIENT_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public enum ClientServerKind implements Enumerator {
 	 * The '<em><b>Server</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SERVER_VALUE
 	 * @generated
 	 * @ordered
@@ -64,10 +67,10 @@ public enum ClientServerKind implements Enumerator {
 	 * The '<em><b>Client</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Client</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Client</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CLIENT
 	 * @model name="client"
 	 * @generated
@@ -79,10 +82,10 @@ public enum ClientServerKind implements Enumerator {
 	 * The '<em><b>Server</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Server</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Server</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SERVER
 	 * @model name="server"
 	 * @generated
@@ -94,18 +97,16 @@ public enum ClientServerKind implements Enumerator {
 	 * An array of all the '<em><b>Client Server Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final ClientServerKind[] VALUES_ARRAY =
-		new ClientServerKind[] {
-			CLIENT,
-			SERVER,
-		};
+	private static final ClientServerKind[] VALUES_ARRAY = new ClientServerKind[]{ CLIENT, SERVER, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Client Server Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ClientServerKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -114,12 +115,15 @@ public enum ClientServerKind implements Enumerator {
 	 * Returns the '<em><b>Client Server Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ClientServerKind get(int value) {
-		switch (value) {
-			case CLIENT_VALUE: return CLIENT;
-			case SERVER_VALUE: return SERVER;
+		switch(value) {
+		case CLIENT_VALUE:
+			return CLIENT;
+		case SERVER_VALUE:
+			return SERVER;
 		}
 		return null;
 	}
@@ -128,12 +132,13 @@ public enum ClientServerKind implements Enumerator {
 	 * Returns the '<em><b>Client Server Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ClientServerKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ClientServerKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -144,12 +149,13 @@ public enum ClientServerKind implements Enumerator {
 	 * Returns the '<em><b>Client Server Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ClientServerKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ClientServerKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -159,6 +165,7 @@ public enum ClientServerKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -166,6 +173,7 @@ public enum ClientServerKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -173,6 +181,7 @@ public enum ClientServerKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -181,6 +190,7 @@ public enum ClientServerKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ClientServerKind(int value, String name, String literal) {
@@ -192,39 +202,43 @@ public enum ClientServerKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //ClientServerKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionPrototype.java
index 836f41b4117..adfea910e21 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionPrototype.java
@@ -20,7 +20,7 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Design Function Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The DesignFunctionPrototype represents references to the occurrence of the DesignFunctionType that types it when it acts as a part.
  * The DesignFunctionPrototype is typed by a DesignFunctionType .
@@ -31,27 +31,28 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * Extension:
  * UML Property, specialization of SysML::BlockProperty
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getDesignFunctionPrototype()
  * @model
  * @generated
  */
 public interface DesignFunctionPrototype extends FunctionPrototype, AllocateableElement {
+
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getDesignFunctionPrototype_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionType.java
index f4da575acf9..e297e2136e9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/DesignFunctionType.java
@@ -21,21 +21,28 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Design Function Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The DesignFunctionType is a concrete FunctionType and therefore inherits the elementary function properties from the abstract metaclass FunctionType. The DesignFunctionType is used to model the functional structure on DesignLevel. The syntax of DesignFunctionTypes is inspired from the type-prototype pattern used by AUTOSAR.
+ * The DesignFunctionType is a concrete FunctionType and therefore inherits the elementary function properties from the abstract metaclass
+ * FunctionType. The DesignFunctionType is used to model the functional structure on DesignLevel. The syntax of DesignFunctionTypes is inspired from
+ * the type-prototype pattern used by AUTOSAR.
  * 
- * The DesignFunctions may interact with other DesignFunctions (i.e., also BasicSoftwareFunctions, HardwareFunctions, and LocalDeviceManager) through their FunctionPorts.
+ * The DesignFunctions may interact with other DesignFunctions (i.e., also BasicSoftwareFunctions, HardwareFunctions, and LocalDeviceManager) through
+ * their FunctionPorts.
  * 
- * Furthermore, a DesignFunction may be decomposed into (sub-)DesignFunctions. This allows breaking up hierarchically the functionalities provided by the parent DesignFunction into subfunctionalities.
+ * Furthermore, a DesignFunction may be decomposed into (sub-)DesignFunctions. This allows breaking up hierarchically the functionalities provided by
+ * the parent DesignFunction into subfunctionalities.
  * 
  * Execution time constraints on the DesignFunctionType can be expressed by ExecutionTimeConstraints, see the Timing package.
  * 
- * If two or more occurrences of an elementary Function are allocated on the same ECU, the code will be placed on the ECU only once (so these occurrences will use the same code but separate memory areas for data).
+ * If two or more occurrences of an elementary Function are allocated on the same ECU, the code will be placed on the ECU only once (so these
+ * occurrences will use the same code but separate memory areas for data).
  * 
  * 
  * Semantics:
- * The DesignFunctionType represents a node in a tree structure corresponding to the functional decomposition of a top level DesignFunction. The DesignFunction is representing the design function used to describe the functionalities provided by a vehicle on the DesignLevel. At the DesignLevel, DesignFunctions are defined and structured according to the functional and hardware system design.
+ * The DesignFunctionType represents a node in a tree structure corresponding to the functional decomposition of a top level DesignFunction. The
+ * DesignFunction is representing the design function used to describe the functionalities provided by a vehicle on the DesignLevel. At the
+ * DesignLevel, DesignFunctions are defined and structured according to the functional and hardware system design.
  * 
  * Constraints:
  * [1] DesignFunctionTypes may only be used on DesignLevel.
@@ -44,28 +51,29 @@ import org.eclipse.emf.common.util.EList;
  * 
  * Extension: UML Class, specialization of SysML::Block
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType#getPart <em>Part</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getDesignFunctionType()
  * @model
  * @generated
  */
 public interface DesignFunctionType extends FunctionType {
+
 	/**
 	 * Returns the value of the '<em><b>Part</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Part</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Part</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getDesignFunctionType_Part()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/EADirectionKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/EADirectionKind.java
index c429e8c2086..5418c8deff4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/EADirectionKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/EADirectionKind.java
@@ -32,9 +32,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * Semantics:
  * The EADirectionKind is an enumeration with the three literals "in", "out", and "inout".
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getEADirectionKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>In</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IN_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OUT_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>Inout</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INOUT_VALUE
 	 * @generated
 	 * @ordered
@@ -74,10 +78,10 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>In</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IN
 	 * @model name="in"
 	 * @generated
@@ -89,10 +93,10 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OUT
 	 * @model name="out"
 	 * @generated
@@ -104,10 +108,10 @@ public enum EADirectionKind implements Enumerator {
 	 * The '<em><b>Inout</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INOUT
 	 * @model name="inout"
 	 * @generated
@@ -119,19 +123,16 @@ public enum EADirectionKind implements Enumerator {
 	 * An array of all the '<em><b>EA Direction Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final EADirectionKind[] VALUES_ARRAY =
-		new EADirectionKind[] {
-			IN,
-			OUT,
-			INOUT,
-		};
+	private static final EADirectionKind[] VALUES_ARRAY = new EADirectionKind[]{ IN, OUT, INOUT, };
 
 	/**
 	 * A public read-only list of all the '<em><b>EA Direction Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<EADirectionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -140,13 +141,17 @@ public enum EADirectionKind implements Enumerator {
 	 * Returns the '<em><b>EA Direction Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EADirectionKind get(int value) {
-		switch (value) {
-			case IN_VALUE: return IN;
-			case OUT_VALUE: return OUT;
-			case INOUT_VALUE: return INOUT;
+		switch(value) {
+		case IN_VALUE:
+			return IN;
+		case OUT_VALUE:
+			return OUT;
+		case INOUT_VALUE:
+			return INOUT;
 		}
 		return null;
 	}
@@ -155,12 +160,13 @@ public enum EADirectionKind implements Enumerator {
 	 * Returns the '<em><b>EA Direction Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EADirectionKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			EADirectionKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -171,12 +177,13 @@ public enum EADirectionKind implements Enumerator {
 	 * Returns the '<em><b>EA Direction Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EADirectionKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			EADirectionKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -186,6 +193,7 @@ public enum EADirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -193,6 +201,7 @@ public enum EADirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -200,6 +209,7 @@ public enum EADirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -208,6 +218,7 @@ public enum EADirectionKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EADirectionKind(int value, String name, String literal) {
@@ -219,39 +230,43 @@ public enum EADirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //EADirectionKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionAllocation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionAllocation.java
index 13b064267b0..8102c9d1cf9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionAllocation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionAllocation.java
@@ -25,14 +25,15 @@ import org.eclipse.uml2.uml.Dependency;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Allocation</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * FunctionAllocation represents an allocation constraint binding an AllocateableElement on an AllocationTarget.
  * 
  * The same constraint could be expressed in a textual design constraint.
  * 
  * Semantics:
- * AllocationTarget is specialized by HardwareComponentPrototype in the HardwareModeling package and AllocateableElement is specialized by the concrete elements DesignFunctionPrototype and FunctionConnector in the FunctionModeling package.
+ * AllocationTarget is specialized by HardwareComponentPrototype in the HardwareModeling package and AllocateableElement is specialized by the
+ * concrete elements DesignFunctionPrototype and FunctionConnector in the FunctionModeling package.
  * 
  * Notation:
  * A FunctionAllocation is shown as a dependency (dashed line) with an "allocation" keyword attached to it.
@@ -45,31 +46,32 @@ import org.eclipse.uml2.uml.Dependency;
  * ToDo:
  * Cf. AUTOSAR SWMapping::MappingConstraint
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement <em>Allocated Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement_path <em>Allocated Element path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget_path <em>Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement <em>Allocated Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement_path <em>Allocated Element path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget_path <em>Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation()
  * @model
  * @generated
  */
 public interface FunctionAllocation extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Allocated Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Allocated Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Allocated Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Allocated Element</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation_AllocatedElement()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -81,10 +83,10 @@ public interface FunctionAllocation extends EAElement {
 	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Dependency</em>' reference.
 	 * @see #setBase_Dependency(Dependency)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation_Base_Dependency()
@@ -94,10 +96,13 @@ public interface FunctionAllocation extends EAElement {
 	Dependency getBase_Dependency();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency <em>Base Dependency</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency
+	 * <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Dependency</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Dependency</em>' reference.
 	 * @see #getBase_Dependency()
 	 * @generated
 	 */
@@ -108,10 +113,10 @@ public interface FunctionAllocation extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Allocated Element path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Allocated Element path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Allocated Element path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation_AllocatedElement_path()
 	 * @model
@@ -124,10 +129,10 @@ public interface FunctionAllocation extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation_Target_path()
 	 * @model
@@ -142,6 +147,7 @@ public interface FunctionAllocation extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The ECU where the functionality must be allocated.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionAllocation_Target()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerInterface.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerInterface.java
index 1cbda4afb75..f06a9fc130a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerInterface.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerInterface.java
@@ -24,37 +24,39 @@ import org.eclipse.uml2.uml.Interface;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Client Server Interface</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The FunctionClientServerInterface is used to specify the operations in FunctionClientServerPorts.
  * 
  * Semantics:
- * The operations of the FunctionClientServerInterface are required or provided through the FunctionClientServerPorts typed by the FunctionClientServerInterface.
+ * The operations of the FunctionClientServerInterface are required or provided through the FunctionClientServerPorts typed by the
+ * FunctionClientServerInterface.
  * 
  * Extension: UML Interface
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface <em>Base Interface</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getOperation <em>Operation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface <em>Base Interface</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getOperation <em>Operation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerInterface()
  * @model
  * @generated
  */
 public interface FunctionClientServerInterface extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Interface</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Interface</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Interface</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Interface</em>' reference.
 	 * @see #setBase_Interface(Interface)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerInterface_Base_Interface()
@@ -64,10 +66,13 @@ public interface FunctionClientServerInterface extends EAElement {
 	Interface getBase_Interface();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface <em>Base Interface</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface
+	 * <em>Base Interface</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Interface</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Interface</em>' reference.
 	 * @see #getBase_Interface()
 	 * @generated
 	 */
@@ -78,10 +83,10 @@ public interface FunctionClientServerInterface extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Operation</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Operation</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Operation</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerInterface_Operation()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerPort.java
index f0212fd7305..fe25b8c5e16 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionClientServerPort.java
@@ -21,11 +21,13 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Client Server Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The FunctionClientServerPort is a FunctionPort for client-server interaction. A number of FunctionClientServerPorts of clientServerType "client" can be connected to one FunctionClientServerPort of clientServerType "server", i.e. when connected the multiplicity for the connection is n to 1 for client and server.
+ * The FunctionClientServerPort is a FunctionPort for client-server interaction. A number of FunctionClientServerPorts of clientServerType "client"
+ * can be connected to one FunctionClientServerPort of clientServerType "server", i.e. when connected the multiplicity for the connection is n to 1
+ * for client and server.
  * 
- * Semantics: 
+ * Semantics:
  * The FunctionClientServerPort is a FunctionPort for client-server interaction.
  * 
  * FunctionClientServerPorts are single buffer overwrite and nonconsumable.
@@ -35,30 +37,31 @@ import org.eclipse.uml2.uml.Port;
  * 
  * Extension: UML Port
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType <em>Client Server Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType <em>Client Server Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerPort()
  * @model
  * @generated
  */
 public interface FunctionClientServerPort extends FunctionPort {
+
 	/**
 	 * Returns the value of the '<em><b>Client Server Type</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Client Server Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Client Server Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Client Server Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind
 	 * @see #setClientServerType(ClientServerKind)
@@ -77,6 +80,7 @@ public interface FunctionClientServerPort extends FunctionPort {
 	 * 
 	 * {derived from UML::TypedElement::type}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerPort_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -88,10 +92,10 @@ public interface FunctionClientServerPort extends FunctionPort {
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionClientServerPort_Base_Port()
@@ -101,20 +105,26 @@ public interface FunctionClientServerPort extends FunctionPort {
 	Port getBase_Port();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port <em>Base Port</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port <em>Base Port</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
 	void setBase_Port(Port value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType <em>Client Server Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType
+	 * <em>Client Server Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Client Server Type</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Client Server Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind
 	 * @see #getClientServerType()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionConnector.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionConnector.java
index 0feb2e0d841..72136245790 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionConnector.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionConnector.java
@@ -24,13 +24,17 @@ import org.eclipse.uml2.uml.Connector;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Connector</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The FunctionConnector indicates that the connected FunctionPorts exchange signals or client-server requests/responses.
  * 
  * Semantics:
- * The FunctionConnector connects a pair of FunctionFlowPorts or FunctionClientServerPorts. If two FunctionFlowPorts are connected, data elements of the type of the output FunctionFlowPort flow from the output FunctionFlowPort to the input FunctionFlowPort. If FunctionClientServerPorts are connected, the client calls the server according to the operations of the interfaces. The occurrence of the FunctionType that specifies the occurrence of the FunctionPrototype has to be identified by the FunctionConnector as well.
- * The FunctionConnector is normally routed according to the hardware topology and the allocation of source and destination. If there are redundant paths, a FunctionAllocation may be used to prescribe allocation.
+ * The FunctionConnector connects a pair of FunctionFlowPorts or FunctionClientServerPorts. If two FunctionFlowPorts are connected, data elements of
+ * the type of the output FunctionFlowPort flow from the output FunctionFlowPort to the input FunctionFlowPort. If FunctionClientServerPorts are
+ * connected, the client calls the server according to the operations of the interfaces. The occurrence of the FunctionType that specifies the
+ * occurrence of the FunctionPrototype has to be identified by the FunctionConnector as well.
+ * The FunctionConnector is normally routed according to the hardware topology and the allocation of source and destination. If there are redundant
+ * paths, a FunctionAllocation may be used to prescribe allocation.
  * 
  * 
  * Constraints:
@@ -48,22 +52,23 @@ import org.eclipse.uml2.uml.Connector;
  * 
  * Extension: UML Connector
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionConnector()
  * @model
  * @generated
  */
 public interface FunctionConnector extends EAElement, AllocateableElement {
+
 	/**
 	 * Returns the value of the '<em><b>Port</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort}.
@@ -73,6 +78,7 @@ public interface FunctionConnector extends EAElement, AllocateableElement {
 	 * The ports that are connected by this connector.
 	 * {derived from UML::Connector::end}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionConnector_Port()
 	 * @model upper="2" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -84,10 +90,10 @@ public interface FunctionConnector extends EAElement, AllocateableElement {
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Connector</em>' reference.
 	 * @see #setBase_Connector(Connector)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionConnector_Base_Connector()
@@ -97,10 +103,13 @@ public interface FunctionConnector extends EAElement, AllocateableElement {
 	Connector getBase_Connector();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector <em>Base Connector</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector
+	 * <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Connector</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Connector</em>' reference.
 	 * @see #getBase_Connector()
 	 * @generated
 	 */
@@ -111,10 +120,10 @@ public interface FunctionConnector extends EAElement, AllocateableElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port1 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionConnector_Port1_path()
 	 * @model
@@ -127,10 +136,10 @@ public interface FunctionConnector extends EAElement, AllocateableElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port2 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionConnector_Port2_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionFlowPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionFlowPort.java
index aafe69f8042..d9c0b1690f5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionFlowPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionFlowPort.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.sysml.portandflows.FlowPort;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Flow Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The FunctionFlowPort is a metaclass for flowports, inspired by the SysML FlowPort.
  * 
@@ -59,36 +59,43 @@ import org.eclipse.papyrus.sysml.portandflows.FlowPort;
  * 
  * FunctionFlowPort with direction=in, is called an input FunctionFlowPort:
  * 
- * The input FunctionFlowPort indicates that the containing Function requires input data. The EADatatype of this data is defined by the associated EADatatype. The data is sampled at the invocation of the containing entity for discrete Functions. For continuous Functions, the input FunctionFlowPort represents a continuous input connection point.
+ * The input FunctionFlowPort indicates that the containing Function requires input data. The EADatatype of this data is defined by the associated
+ * EADatatype. The data is sampled at the invocation of the containing entity for discrete Functions. For continuous Functions, the input
+ * FunctionFlowPort represents a continuous input connection point.
  * 
- * The input FunctionFlowPort declares a reception point of data. It represents a single element buffer, which is overridden with the latest data. The type of the data is defined by the associated EADatatype.
+ * The input FunctionFlowPort declares a reception point of data. It represents a single element buffer, which is overridden with the latest data. The
+ * type of the data is defined by the associated EADatatype.
  * 
  * FunctionFlowPort with direction=out, is called an output FunctionFlowPort:
  * 
- * The output FunctionFlowPort indicates that the containing Function provides output data. The EADatatype of this data is defined by the associated EADatatype. The data is sent at the completion of the containing entity for discrete Functions. For continuous Functions, the output FunctionFlowPort represents a (time-)continuous output connection point.
+ * The output FunctionFlowPort indicates that the containing Function provides output data. The EADatatype of this data is defined by the associated
+ * EADatatype. The data is sent at the completion of the containing entity for discrete Functions. For continuous Functions, the output
+ * FunctionFlowPort represents a (time-)continuous output connection point.
  * 
  * The output FunctionFlowPort declares a transmission point of data. The type of the data is defined by the associated EADatatype.
  * 
  * 
  * Extension: UML Port, specialization of SysML::FlowPort
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionFlowPort()
  * @model
  * @generated
  */
 public interface FunctionFlowPort extends FlowPort, FunctionPort {
+
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionFlowPort_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPort.java
index a4eae009970..be646b91f4f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPort.java
@@ -22,12 +22,12 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The ports conserve variables for component interaction.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPort()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPowerPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPowerPort.java
index 4f3681565f1..6118c77680c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPowerPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPowerPort.java
@@ -23,47 +23,51 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Power Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The FunctionPowerPort is a FunctionPort for denoting the physical interactions between environment and sensing/actuation functions.
  * 
- * Semantics: 
+ * Semantics:
  * The FunctionPowerPort conserves physical variables in a dynamic process.
  * 
- * The typing Datatype owns two datatypePrototypes called Across and Through, representing the exchanged physical variables of the FunctionPowerPort. In two or more directly connected function power ports, the Across variables always get the same value and the Through variables always sum up to zero.
+ * The typing Datatype owns two datatypePrototypes called Across and Through, representing the exchanged physical variables of the FunctionPowerPort.
+ * In two or more directly connected function power ports, the Across variables always get the same value and the Through variables always sum up to
+ * zero.
  * 
  * Constraints:
- * [1] The owner of a FunctionPowerPort is either a FunctionalDevice, a HardwareFunctionType, or a FunctionType for environment 
+ * [1] The owner of a FunctionPowerPort is either a FunctionalDevice, a HardwareFunctionType, or a FunctionType for environment
  * 
  * [2] Two connected FunctionPowerPort must have the same Datatype.
  * 
- * [3] The typing Datatype shall have two datatypePrototypes called Across and Through, with Datatypes that are consistent and representing the variables of the PowerPort. 
+ * [3] The typing Datatype shall have two datatypePrototypes called Across and Through, with Datatypes that are consistent and representing the
+ * variables of the PowerPort.
  * 
  * 
  * Extension: UML Port
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPowerPort()
  * @model
  * @generated
  */
 public interface FunctionPowerPort extends FunctionPort {
+
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPowerPort_Base_Port()
@@ -73,10 +77,13 @@ public interface FunctionPowerPort extends FunctionPort {
 	Port getBase_Port();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port <em>Base Port</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port <em>Base Port</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
@@ -86,10 +93,10 @@ public interface FunctionPowerPort extends FunctionPort {
 	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPowerPort_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPrototype.java
index aca8468047f..a33777b80da 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionPrototype.java
@@ -25,7 +25,7 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * FunctionPrototype represents a reference to the occurrence of a FunctionType when it acts as a part.
  * 
@@ -44,30 +44,31 @@ import org.eclipse.uml2.uml.Property;
  * Changes:
  * Renamed from ADLFunctionPart
  * 
- * Extension: 
+ * Extension:
  * To specialize SysML::BlockProperty, which extends Property
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPrototype()
  * @model abstract="true"
  * @generated
  */
 public interface FunctionPrototype extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionPrototype_Base_Property()
@@ -77,10 +78,13 @@ public interface FunctionPrototype extends EAElement {
 	Property getBase_Property();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property <em>Base Property</em>}
+	 * ' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
@@ -89,6 +93,7 @@ public interface FunctionPrototype extends EAElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @model kind="operation" required="true" ordered="false"
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionType.java
index 1e51cd3bc02..a05a240890a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionType.java
@@ -25,9 +25,10 @@ import org.eclipse.uml2.uml.Image;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Function Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The abstract metaclass FunctionType abstracts the function component types that are used to model the functional structure, which is distinguished from the implementation of component types using AUTOSAR. The syntax of FunctionTypes is inspired from the concept of Block from SysML.
+ * The abstract metaclass FunctionType abstracts the function component types that are used to model the functional structure, which is distinguished
+ * from the implementation of component types using AUTOSAR. The syntax of FunctionTypes is inspired from the concept of Block from SysML.
  * 
  * FunctionBehavior and FunctionTrigger in the Behavior package are associated to a FunctionType.
  * 
@@ -42,15 +43,18 @@ import org.eclipse.uml2.uml.Image;
  * Execution is defined by a behavior that acts as a transfer function.
  * Subclasses of the abstract class FunctionType add their own semantics.
  * 
- * If a behavior is attached to the FunctionType, the execution semantic for a discrete elementary FunctionType complies with the run-to-completion semantic. This has the following implications:
+ * If a behavior is attached to the FunctionType, the execution semantic for a discrete elementary FunctionType complies with the run-to-completion
+ * semantic. This has the following implications:
  * 
  * 1. Input that arrives at the input FunctionPorts after execution begins will be ignored until the next execution cycle.
  * 
- * 2. If more than one input value arrives per FunctionPort before execution begins the last value will override all previous ones in the public part of the input FunctionPort (single element buffers for input).
+ * 2. If more than one input value arrives per FunctionPort before execution begins the last value will override all previous ones in the public part
+ * of the input FunctionPort (single element buffers for input).
  * 
  * 3. The local part of a FunctionPort does not change its value during execution of the behavior.
  * 
- * 4. During an execution cycle only one output value can be sent per FunctionPort. If consecutive output values are produced on the same FunctionPort during a single execution cycle, the last value will override all previous ones on the output FunctionPort (single element buffers for output).
+ * 4. During an execution cycle only one output value can be sent per FunctionPort. If consecutive output values are produced on the same FunctionPort
+ * during a single execution cycle, the last value will override all previous ones on the output FunctionPort (single element buffers for output).
  * 
  * 5. Output will not be available at an output FunctionPort before execution ends.
  * 
@@ -61,35 +65,37 @@ import org.eclipse.uml2.uml.Image;
  * [1] Elementary FunctionTypes shall not have parts.
  * 
  * Notation:
- * The FunctionType is shown as a solid-outline rectangle containing the name, with its FunctionPorts or PortGroups on the perimeter. Contained entities may be shown with its FunctionConnectors (White-box view)
+ * The FunctionType is shown as a solid-outline rectangle containing the name, with its FunctionPorts or PortGroups on the perimeter. Contained
+ * entities may be shown with its FunctionConnectors (White-box view)
  * 
  * Extension: UML Class, specialization of SysML::Block
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#isIsElementary <em>Is Elementary</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPortGroup <em>Port Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getConnector <em>Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#isIsElementary <em>Is Elementary</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getConnector <em>Connector</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionType()
  * @model abstract="true"
  * @generated
  */
 public interface FunctionType extends Context, Block {
+
 	/**
 	 * Returns the value of the '<em><b>Connector</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Connector</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Connector</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Connector</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionType_Connector()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -100,6 +106,7 @@ public interface FunctionType extends Context, Block {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @model kind="operation" required="true" ordered="false"
 	 * @generated
 	 */
@@ -114,6 +121,7 @@ public interface FunctionType extends Context, Block {
 	 * Owned in- and out-flow ports.
 	 * {derived from UML::EncapsulatedClassifier::ownedPort}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionType_Port()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -130,6 +138,7 @@ public interface FunctionType extends Context, Block {
 	 * Grouping of ports owned by this element.
 	 * {derived from UML::Class::nestedClassifier}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Port Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionType_PortGroup()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -142,13 +151,14 @@ public interface FunctionType extends Context, Block {
 	 * The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Is Elementary</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Is Elementary</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Is Elementary</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionType_IsElementary()
-	 * @model default="false" dataType="org.eclipse.uml2.types.Boolean" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
+	 * @model default="false" dataType="org.eclipse.uml2.types.Boolean" required="true" transient="true" changeable="false" volatile="true"
+	 *        derived="true" ordered="false"
 	 * @generated
 	 */
 	boolean isIsElementary();
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionalDevice.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionalDevice.java
index e63bc7f1e1a..d74d2e1724f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionalDevice.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionalDevice.java
@@ -18,13 +18,18 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Functional Device</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * The FunctionalDevice represents an abstract sensor or actuator that encapsulates sensor/actuator dynamics and the interfacing software. The FunctionalDevice is the interface between the electronic architecture and the environment (connected by ClampConnectors). As such, it is a transfer function between the AnalysisFunction and the physical entity that it measures or actuates.

- * A Realization dependency can be used for traceability between LocalDeviceManagers and Sensors/Actuators that are represented by the FunctionalDevice.

+ * The FunctionalDevice represents an abstract sensor or actuator that encapsulates sensor/actuator dynamics and the interfacing software. The

+ * FunctionalDevice is the interface between the electronic architecture and the environment (connected by ClampConnectors). As such, it is a transfer

+ * function between the AnalysisFunction and the physical entity that it measures or actuates.

+ * A Realization dependency can be used for traceability between LocalDeviceManagers and Sensors/Actuators that are represented by the

+ * FunctionalDevice.

  * 

  * Semantics:

- * The behavior associated with the FunctionalDevice is the transfer function between the environment model representing the environment and an AnalysisFunction. The transfer function represents the sensor or actuator and its interfacing hardware and software (connectors, electronics, in/out interface, driver software, and application software).

+ * The behavior associated with the FunctionalDevice is the transfer function between the environment model representing the environment and an

+ * AnalysisFunction. The transfer function represents the sensor or actuator and its interfacing hardware and software (connectors, electronics,

+ * in/out interface, driver software, and application software).

  * 

  * Constraints:

  * No additional constraints.

@@ -34,8 +39,8 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * 

  * Extension: Class, specialization of SysML::Block

  * <!-- end-model-doc -->

- *

- *

+ * 

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getFunctionalDevice()

  * @model

  * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingFactory.java
index 61d0d4adb2b..abe17b6884d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	FunctionmodelingFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Allocation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Allocation</em>'.

 	 * @generated

 	 */

@@ -45,6 +48,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Analysis Function Prototype</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Analysis Function Prototype</em>'.

 	 * @generated

 	 */

@@ -54,6 +58,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Analysis Function Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Analysis Function Type</em>'.

 	 * @generated

 	 */

@@ -63,6 +68,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Basic Software Function Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Basic Software Function Type</em>'.

 	 * @generated

 	 */

@@ -72,6 +78,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Design Function Prototype</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Design Function Prototype</em>'.

 	 * @generated

 	 */

@@ -81,6 +88,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Design Function Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Design Function Type</em>'.

 	 * @generated

 	 */

@@ -90,6 +98,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Functional Device</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Functional Device</em>'.

 	 * @generated

 	 */

@@ -99,6 +108,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Allocation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Allocation</em>'.

 	 * @generated

 	 */

@@ -108,6 +118,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Client Server Interface</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Client Server Interface</em>'.

 	 * @generated

 	 */

@@ -117,6 +128,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Client Server Port</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Client Server Port</em>'.

 	 * @generated

 	 */

@@ -126,6 +138,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Connector</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Connector</em>'.

 	 * @generated

 	 */

@@ -135,6 +148,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Flow Port</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Flow Port</em>'.

 	 * @generated

 	 */

@@ -144,6 +158,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Function Power Port</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Function Power Port</em>'.

 	 * @generated

 	 */

@@ -153,6 +168,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Hardware Function Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Hardware Function Type</em>'.

 	 * @generated

 	 */

@@ -162,6 +178,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Local Device Manager</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Local Device Manager</em>'.

 	 * @generated

 	 */

@@ -171,6 +188,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Operation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Operation</em>'.

 	 * @generated

 	 */

@@ -180,6 +198,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Port Group</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Port Group</em>'.

 	 * @generated

 	 */

@@ -188,6 +207,7 @@ public interface FunctionmodelingFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingPackage.java
index a3233df0cbe..dd41ae6e7b3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/FunctionmodelingPackage.java
@@ -62,14 +62,17 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl <em>Function Type</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl

+		 * <em>Function Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionType()

 		 * @generated

@@ -80,6 +83,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Elementary</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_TYPE__IS_ELEMENTARY = eINSTANCE.getFunctionType_IsElementary();

@@ -88,6 +92,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TYPE__PORT = eINSTANCE.getFunctionType_Port();

@@ -96,6 +101,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port Group</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TYPE__PORT_GROUP = eINSTANCE.getFunctionType_PortGroup();

@@ -104,14 +110,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Connector</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_TYPE__CONNECTOR = eINSTANCE.getFunctionType_Connector();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPortImpl <em>Function Port</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPortImpl

+		 * <em>Function Port</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPortImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPort()

 		 * @generated

@@ -119,9 +128,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EClass FUNCTION_PORT = eINSTANCE.getFunctionPort();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl <em>Function Connector</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl

+		 * <em>Function Connector</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionConnector()

 		 * @generated

@@ -132,6 +143,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CONNECTOR__PORT = eINSTANCE.getFunctionConnector_Port();

@@ -140,6 +152,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getFunctionConnector_Base_Connector();

@@ -148,6 +161,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port1 path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CONNECTOR__PORT1_PATH = eINSTANCE.getFunctionConnector_Port1_path();

@@ -156,14 +170,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port2 path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CONNECTOR__PORT2_PATH = eINSTANCE.getFunctionConnector_Port2_path();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl <em>Analysis Function Prototype</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl

+		 * <em>Analysis Function Prototype</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAnalysisFunctionPrototype()

 		 * @generated

@@ -174,14 +191,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ANALYSIS_FUNCTION_PROTOTYPE__TYPE = eINSTANCE.getAnalysisFunctionPrototype_Type();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl <em>Function Flow Port</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl

+		 * <em>Function Flow Port</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionFlowPort()

 		 * @generated

@@ -192,14 +212,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_FLOW_PORT__TYPE = eINSTANCE.getFunctionFlowPort_Type();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl <em>Function Client Server Port</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl

+		 * <em>Function Client Server Port</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionClientServerPort()

 		 * @generated

@@ -210,6 +233,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CLIENT_SERVER_PORT__TYPE = eINSTANCE.getFunctionClientServerPort_Type();

@@ -218,6 +242,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CLIENT_SERVER_PORT__BASE_PORT = eINSTANCE.getFunctionClientServerPort_Base_Port();

@@ -226,14 +251,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Client Server Type</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE = eINSTANCE.getFunctionClientServerPort_ClientServerType();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl <em>Function Client Server Interface</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl

+		 * <em>Function Client Server Interface</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionClientServerInterface()

 		 * @generated

@@ -244,6 +272,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Interface</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE = eINSTANCE.getFunctionClientServerInterface_Base_Interface();

@@ -252,14 +281,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Operation</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_CLIENT_SERVER_INTERFACE__OPERATION = eINSTANCE.getFunctionClientServerInterface_Operation();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl <em>Operation</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl <em>Operation</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getOperation()

 		 * @generated

@@ -270,6 +302,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference OPERATION__BASE_OPERATION = eINSTANCE.getOperation_Base_Operation();

@@ -278,6 +311,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Argument</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference OPERATION__ARGUMENT = eINSTANCE.getOperation_Argument();

@@ -286,14 +320,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Return</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference OPERATION__RETURN = eINSTANCE.getOperation_Return();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl <em>Port Group</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl <em>Port Group</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getPortGroup()

 		 * @generated

@@ -304,6 +341,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PORT_GROUP__PORT = eINSTANCE.getPortGroup_Port();

@@ -312,6 +350,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PORT_GROUP__BASE_CLASS = eINSTANCE.getPortGroup_Base_Class();

@@ -320,6 +359,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PORT_GROUP__BASE_PORT = eINSTANCE.getPortGroup_Base_Port();

@@ -328,14 +368,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port Group</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PORT_GROUP__PORT_GROUP = eINSTANCE.getPortGroup_PortGroup();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl <em>Basic Software Function Type</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl

+		 * <em>Basic Software Function Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getBasicSoftwareFunctionType()

 		 * @generated

@@ -343,9 +386,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EClass BASIC_SOFTWARE_FUNCTION_TYPE = eINSTANCE.getBasicSoftwareFunctionType();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl <em>Hardware Function Type</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl

+		 * <em>Hardware Function Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getHardwareFunctionType()

 		 * @generated

@@ -356,14 +401,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hardware Component</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT = eINSTANCE.getHardwareFunctionType_HardwareComponent();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl <em>Function Allocation</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl

+		 * <em>Function Allocation</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionAllocation()

 		 * @generated

@@ -374,6 +422,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_ALLOCATION__TARGET = eINSTANCE.getFunctionAllocation_Target();

@@ -382,6 +431,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Allocated Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_ALLOCATION__ALLOCATED_ELEMENT = eINSTANCE.getFunctionAllocation_AllocatedElement();

@@ -390,6 +440,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_ALLOCATION__BASE_DEPENDENCY = eINSTANCE.getFunctionAllocation_Base_Dependency();

@@ -398,6 +449,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Allocated Element path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH = eINSTANCE.getFunctionAllocation_AllocatedElement_path();

@@ -406,14 +458,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target path</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_ALLOCATION__TARGET_PATH = eINSTANCE.getFunctionAllocation_Target_path();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl <em>Allocation</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl <em>Allocation</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAllocation()

 		 * @generated

@@ -424,6 +479,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ALLOCATION__BASE_CLASS = eINSTANCE.getAllocation_Base_Class();

@@ -432,6 +488,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ALLOCATION__BASE_PACKAGE = eINSTANCE.getAllocation_Base_Package();

@@ -440,14 +497,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Allocation</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ALLOCATION__FUNCTION_ALLOCATION = eINSTANCE.getAllocation_FunctionAllocation();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl <em>Function Power Port</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl

+		 * <em>Function Power Port</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPowerPort()

 		 * @generated

@@ -458,6 +518,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_POWER_PORT__BASE_PORT = eINSTANCE.getFunctionPowerPort_Base_Port();

@@ -466,14 +527,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_POWER_PORT__TYPE = eINSTANCE.getFunctionPowerPort_Type();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind <em>EA Direction Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind <em>EA Direction Kind</em>}'

+		 * enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getEADirectionKind()

 		 * @generated

@@ -481,9 +545,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EEnum EA_DIRECTION_KIND = eINSTANCE.getEADirectionKind();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind <em>Client Server Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind

+		 * <em>Client Server Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getClientServerKind()

 		 * @generated

@@ -491,9 +557,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EEnum CLIENT_SERVER_KIND = eINSTANCE.getClientServerKind();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl <em>Function Prototype</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl

+		 * <em>Function Prototype</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPrototype()

 		 * @generated

@@ -504,14 +572,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FUNCTION_PROTOTYPE__BASE_PROPERTY = eINSTANCE.getFunctionPrototype_Base_Property();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl <em>Allocateable Element</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl

+		 * <em>Allocateable Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAllocateableElement()

 		 * @generated

@@ -519,8 +590,10 @@ public interface FunctionmodelingPackage extends EPackage {
 		EClass ALLOCATEABLE_ELEMENT = eINSTANCE.getAllocateableElement();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl <em>Local Device Manager</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl

+		 * <em>Local Device Manager</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getLocalDeviceManager()

 		 * @generated

@@ -528,9 +601,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EClass LOCAL_DEVICE_MANAGER = eINSTANCE.getLocalDeviceManager();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl <em>Design Function Type</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl

+		 * <em>Design Function Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getDesignFunctionType()

 		 * @generated

@@ -541,14 +616,17 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Part</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference DESIGN_FUNCTION_TYPE__PART = eINSTANCE.getDesignFunctionType_Part();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl <em>Design Function Prototype</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl

+		 * <em>Design Function Prototype</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getDesignFunctionPrototype()

 		 * @generated

@@ -559,13 +637,16 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference DESIGN_FUNCTION_PROTOTYPE__TYPE = eINSTANCE.getDesignFunctionPrototype_Type();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl <em>Functional Device</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl

+		 * <em>Functional Device</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionalDevice()

 		 * @generated

@@ -573,9 +654,11 @@ public interface FunctionmodelingPackage extends EPackage {
 		EClass FUNCTIONAL_DEVICE = eINSTANCE.getFunctionalDevice();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl <em>Analysis Function Type</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl

+		 * <em>Analysis Function Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAnalysisFunctionType()

 		 * @generated

@@ -586,6 +669,7 @@ public interface FunctionmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Part</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference ANALYSIS_FUNCTION_TYPE__PART = eINSTANCE.getAnalysisFunctionType_Part();

@@ -595,6 +679,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "functionmodeling";

@@ -602,6 +687,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/FunctionModeling/1";

@@ -609,6 +695,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "FunctionModeling";

@@ -616,14 +703,17 @@ public interface FunctionmodelingPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	FunctionmodelingPackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl <em>Design Function Type</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl

+	 * <em>Design Function Type</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getDesignFunctionType()

 	 * @generated

@@ -634,6 +724,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl <em>Function Type</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionType()

 	 * @generated

@@ -644,6 +735,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -653,6 +745,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -662,6 +755,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -671,6 +765,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -680,15 +775,18 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int FUNCTION_TYPE__OWNED_RELATIONSHIP = ElementsPackage.CONTEXT__OWNED_RELATIONSHIP;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl <em>Function Connector</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl

+	 * <em>Function Connector</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionConnector()

 	 * @generated

@@ -696,9 +794,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int FUNCTION_CONNECTOR = 5;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl <em>Function Flow Port</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl

+	 * <em>Function Flow Port</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionFlowPort()

 	 * @generated

@@ -706,9 +806,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int FUNCTION_FLOW_PORT = 12;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl <em>Function Client Server Port</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl

+	 * <em>Function Client Server Port</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionClientServerPort()

 	 * @generated

@@ -716,9 +818,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int FUNCTION_CLIENT_SERVER_PORT = 13;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl <em>Function Client Server Interface</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl

+	 * <em>Function Client Server Interface</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionClientServerInterface()

 	 * @generated

@@ -729,6 +833,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl <em>Port Group</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getPortGroup()

 	 * @generated

@@ -736,8 +841,10 @@ public interface FunctionmodelingPackage extends EPackage {
 	int PORT_GROUP = 4;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl <em>Local Device Manager</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl

+	 * <em>Local Device Manager</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.LocalDeviceManagerImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getLocalDeviceManager()

 	 * @generated

@@ -745,8 +852,10 @@ public interface FunctionmodelingPackage extends EPackage {
 	int LOCAL_DEVICE_MANAGER = 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl <em>Functional Device</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl <em>Functional Device</em>}

+	 * ' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionalDeviceImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionalDevice()

 	 * @generated

@@ -754,9 +863,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int FUNCTIONAL_DEVICE = 9;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl <em>Analysis Function Type</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl

+	 * <em>Analysis Function Type</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAnalysisFunctionType()

 	 * @generated

@@ -764,9 +875,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int ANALYSIS_FUNCTION_TYPE = 10;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl <em>Analysis Function Prototype</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl

+	 * <em>Analysis Function Prototype</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAnalysisFunctionPrototype()

 	 * @generated

@@ -774,9 +887,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int ANALYSIS_FUNCTION_PROTOTYPE = 11;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl <em>Function Prototype</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl

+	 * <em>Function Prototype</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPrototype()

 	 * @generated

@@ -787,6 +902,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl <em>Operation</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getOperation()

 	 * @generated

@@ -794,9 +910,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int OPERATION = 15;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl <em>Design Function Prototype</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl

+	 * <em>Design Function Prototype</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getDesignFunctionPrototype()

 	 * @generated

@@ -804,9 +922,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int DESIGN_FUNCTION_PROTOTYPE = 8;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl <em>Allocateable Element</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl

+	 * <em>Allocateable Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocateableElementImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAllocateableElement()

 	 * @generated

@@ -817,6 +937,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -826,6 +947,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -835,6 +957,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -844,6 +967,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -853,6 +977,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -862,6 +987,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -871,6 +997,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -880,6 +1007,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -889,6 +1017,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -898,6 +1027,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -907,6 +1037,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -916,6 +1047,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -925,6 +1057,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -934,6 +1067,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -943,6 +1077,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -952,6 +1087,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -961,6 +1097,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -970,6 +1107,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -979,6 +1117,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -988,6 +1127,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Design Function Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -997,6 +1137,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1006,6 +1147,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1015,6 +1157,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1024,6 +1167,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1033,6 +1177,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1042,6 +1187,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1051,6 +1197,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1060,6 +1207,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1069,6 +1217,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1078,6 +1227,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1087,6 +1237,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1096,6 +1247,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1114,6 +1266,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPortImpl <em>Function Port</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPortImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPort()

 	 * @generated

@@ -1124,6 +1277,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1133,6 +1287,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1142,6 +1297,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1151,6 +1307,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1160,6 +1317,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1169,6 +1327,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1178,6 +1337,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1187,6 +1347,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1196,6 +1357,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1205,6 +1367,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1214,6 +1377,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1223,6 +1387,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Port Group</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1232,6 +1397,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1241,6 +1407,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1250,6 +1417,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1259,6 +1427,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1268,6 +1437,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Connector</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1277,6 +1447,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port1 path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1286,6 +1457,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port2 path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1295,6 +1467,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Connector</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1304,6 +1477,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Allocateable Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1313,6 +1487,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1322,6 +1497,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1331,6 +1507,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1340,6 +1517,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1349,6 +1527,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Prototype</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1358,6 +1537,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1367,6 +1547,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1376,6 +1557,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1385,6 +1567,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1394,6 +1577,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1403,6 +1587,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Design Function Prototype</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1412,6 +1597,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1421,6 +1607,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1430,6 +1617,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1439,6 +1627,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1448,6 +1637,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1457,6 +1647,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1466,6 +1657,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1475,6 +1667,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1484,6 +1677,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1493,6 +1687,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1502,6 +1697,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1511,6 +1707,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1520,6 +1717,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Analysis Function Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1529,6 +1727,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1538,6 +1737,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1547,6 +1747,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1556,6 +1757,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1565,6 +1767,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1574,6 +1777,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1583,6 +1787,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1592,6 +1797,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1601,6 +1807,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1610,6 +1817,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1619,6 +1827,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1628,6 +1837,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1646,6 +1856,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1655,6 +1866,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1664,6 +1876,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1673,6 +1886,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1682,6 +1896,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1691,6 +1906,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Analysis Function Prototype</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1700,6 +1916,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1709,6 +1926,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Atomic</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1718,6 +1936,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Conjugated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1727,6 +1946,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Direction</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1736,6 +1956,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1745,6 +1966,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1754,6 +1976,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1763,6 +1986,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1772,6 +1996,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Flow Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1781,6 +2006,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1790,6 +2016,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1799,6 +2026,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1808,6 +2036,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1817,6 +2046,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1826,6 +2056,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Client Server Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1835,6 +2066,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Client Server Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1844,6 +2076,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1853,6 +2086,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1862,6 +2096,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1871,6 +2106,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Interface</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1880,6 +2116,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Operation</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1889,6 +2126,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Client Server Interface</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1898,6 +2136,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1907,6 +2146,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1916,6 +2156,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1925,6 +2166,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Operation</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1934,6 +2176,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Argument</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1943,6 +2186,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Return</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1952,15 +2196,18 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Operation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int OPERATION_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 3;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl <em>Basic Software Function Type</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl

+	 * <em>Basic Software Function Type</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.BasicSoftwareFunctionTypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getBasicSoftwareFunctionType()

 	 * @generated

@@ -1971,6 +2218,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1980,6 +2228,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1989,6 +2238,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1998,6 +2248,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2007,6 +2258,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2016,6 +2268,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2025,6 +2278,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2034,6 +2288,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2043,6 +2298,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2052,6 +2308,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2061,6 +2318,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2070,6 +2328,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2079,15 +2338,18 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Basic Software Function Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int BASIC_SOFTWARE_FUNCTION_TYPE_FEATURE_COUNT = DESIGN_FUNCTION_TYPE_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl <em>Hardware Function Type</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl

+	 * <em>Hardware Function Type</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getHardwareFunctionType()

 	 * @generated

@@ -2098,6 +2360,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2107,6 +2370,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2116,6 +2380,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2125,6 +2390,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2134,6 +2400,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2143,6 +2410,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2152,6 +2420,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2161,6 +2430,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Elementary</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2170,6 +2440,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2179,6 +2450,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2188,6 +2460,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2197,6 +2470,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2206,6 +2480,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Hardware Component</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2215,15 +2490,18 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Function Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int HARDWARE_FUNCTION_TYPE_FEATURE_COUNT = DESIGN_FUNCTION_TYPE_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl <em>Function Allocation</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl

+	 * <em>Function Allocation</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionAllocation()

 	 * @generated

@@ -2234,6 +2512,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2243,6 +2522,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2252,6 +2532,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2261,6 +2542,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2270,6 +2552,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allocated Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2279,6 +2562,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2288,6 +2572,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allocated Element path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2297,6 +2582,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Target path</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2306,6 +2592,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Allocation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2315,6 +2602,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl <em>Allocation</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getAllocation()

 	 * @generated

@@ -2325,6 +2613,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2334,6 +2623,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2343,6 +2633,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2352,6 +2643,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2361,6 +2653,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2370,6 +2663,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Allocation</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2379,15 +2673,18 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Allocation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int ALLOCATION_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 3;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl <em>Function Power Port</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl

+	 * <em>Function Power Port</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getFunctionPowerPort()

 	 * @generated

@@ -2398,6 +2695,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2407,6 +2705,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2416,6 +2715,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2425,6 +2725,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2434,6 +2735,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2443,6 +2745,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Function Power Port</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -2452,6 +2755,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind <em>EA Direction Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getEADirectionKind()

 	 * @generated

@@ -2462,6 +2766,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind <em>Client Server Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionmodelingPackageImpl#getClientServerKind()

 	 * @generated

@@ -2469,9 +2774,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	int CLIENT_SERVER_KIND = 21;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement <em>Allocateable Element</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement

+	 * <em>Allocateable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Allocateable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement

 	 * @generated

@@ -2482,6 +2789,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation <em>Allocation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Allocation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation

 	 * @generated

@@ -2489,9 +2797,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getAllocation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Class()

 	 * @see #getAllocation()

@@ -2500,9 +2810,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getAllocation_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getBase_Package()

 	 * @see #getAllocation()

@@ -2511,9 +2823,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getAllocation_Base_Package();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getFunctionAllocation <em>Function Allocation</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getFunctionAllocation

+	 * <em>Function Allocation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Function Allocation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation#getFunctionAllocation()

 	 * @see #getAllocation()

@@ -2522,9 +2836,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getAllocation_FunctionAllocation();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype <em>Analysis Function Prototype</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype

+	 * <em>Analysis Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Analysis Function Prototype</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype

 	 * @generated

@@ -2532,9 +2848,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getAnalysisFunctionPrototype();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype#getType <em>Type</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype#getType

+	 * <em>Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype#getType()

 	 * @see #getAnalysisFunctionPrototype()

@@ -2543,9 +2861,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getAnalysisFunctionPrototype_Type();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType <em>Analysis Function Type</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType

+	 * <em>Analysis Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Analysis Function Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType

 	 * @generated

@@ -2553,9 +2873,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getAnalysisFunctionType();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType#getPart <em>Part</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType#getPart

+	 * <em>Part</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Part</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType#getPart()

 	 * @see #getAnalysisFunctionType()

@@ -2564,9 +2886,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getAnalysisFunctionType_Part();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType <em>Basic Software Function Type</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType

+	 * <em>Basic Software Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Basic Software Function Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType

 	 * @generated

@@ -2577,6 +2901,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind <em>Client Server Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Client Server Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.ClientServerKind

 	 * @generated

@@ -2587,6 +2912,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind <em>EA Direction Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>EA Direction Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind

 	 * @generated

@@ -2594,9 +2920,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EEnum getEADirectionKind();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype <em>Design Function Prototype</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype

+	 * <em>Design Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Design Function Prototype</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype

 	 * @generated

@@ -2604,9 +2932,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getDesignFunctionPrototype();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype#getType <em>Type</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype#getType

+	 * <em>Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype#getType()

 	 * @see #getDesignFunctionPrototype()

@@ -2615,9 +2945,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getDesignFunctionPrototype_Type();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType <em>Design Function Type</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType

+	 * <em>Design Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Design Function Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType

 	 * @generated

@@ -2625,9 +2957,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getDesignFunctionType();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType#getPart <em>Part</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType#getPart

+	 * <em>Part</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Part</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType#getPart()

 	 * @see #getDesignFunctionType()

@@ -2638,6 +2972,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionalDevice <em>Functional Device</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Functional Device</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionalDevice

 	 * @generated

@@ -2645,9 +2980,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionalDevice();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation <em>Function Allocation</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation

+	 * <em>Function Allocation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Allocation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation

 	 * @generated

@@ -2655,9 +2992,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionAllocation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement <em>Allocated Element</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement <em>Allocated Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Allocated Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement()

 	 * @see #getFunctionAllocation()

@@ -2666,9 +3005,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionAllocation_AllocatedElement();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency <em>Base Dependency</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency

+	 * <em>Base Dependency</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Dependency</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getBase_Dependency()

 	 * @see #getFunctionAllocation()

@@ -2677,9 +3018,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionAllocation_Base_Dependency();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement_path <em>Allocated Element path</em>}'.

+	 * Returns the meta object for the reference list '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement_path <em>Allocated Element path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Allocated Element path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getAllocatedElement_path()

 	 * @see #getFunctionAllocation()

@@ -2688,9 +3031,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionAllocation_AllocatedElement_path();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget_path <em>Target path</em>}'.

+	 * Returns the meta object for the reference list '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget_path <em>Target path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Target path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget_path()

 	 * @see #getFunctionAllocation()

@@ -2699,9 +3044,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionAllocation_Target_path();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget <em>Target</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget

+	 * <em>Target</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Target</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation#getTarget()

 	 * @see #getFunctionAllocation()

@@ -2710,9 +3057,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionAllocation_Target();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface <em>Function Client Server Interface</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface

+	 * <em>Function Client Server Interface</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Client Server Interface</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface

 	 * @generated

@@ -2720,9 +3069,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionClientServerInterface();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface <em>Base Interface</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface <em>Base Interface</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Interface</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getBase_Interface()

 	 * @see #getFunctionClientServerInterface()

@@ -2731,9 +3082,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionClientServerInterface_Base_Interface();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getOperation <em>Operation</em>}'.

+	 * Returns the meta object for the reference list '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getOperation <em>Operation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Operation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface#getOperation()

 	 * @see #getFunctionClientServerInterface()

@@ -2742,9 +3095,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionClientServerInterface_Operation();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort <em>Function Client Server Port</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort

+	 * <em>Function Client Server Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Client Server Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort

 	 * @generated

@@ -2752,9 +3107,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionClientServerPort();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType <em>Client Server Type</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType <em>Client Server Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Client Server Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getClientServerType()

 	 * @see #getFunctionClientServerPort()

@@ -2763,9 +3120,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EAttribute getFunctionClientServerPort_ClientServerType();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getType <em>Type</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getType

+	 * <em>Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getType()

 	 * @see #getFunctionClientServerPort()

@@ -2774,9 +3133,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionClientServerPort_Type();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port <em>Base Port</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port

+	 * <em>Base Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort#getBase_Port()

 	 * @see #getFunctionClientServerPort()

@@ -2785,9 +3146,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionClientServerPort_Base_Port();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector <em>Function Connector</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector <em>Function Connector</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Connector</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector

 	 * @generated

@@ -2795,9 +3158,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionConnector();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort <em>Port</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort

+	 * <em>Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort()

 	 * @see #getFunctionConnector()

@@ -2806,9 +3171,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionConnector_Port();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector <em>Base Connector</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector

+	 * <em>Base Connector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Connector</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getBase_Connector()

 	 * @see #getFunctionConnector()

@@ -2817,9 +3184,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionConnector_Base_Connector();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort1_path <em>Port1 path</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort1_path

+	 * <em>Port1 path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port1 path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort1_path()

 	 * @see #getFunctionConnector()

@@ -2828,9 +3197,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionConnector_Port1_path();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort2_path <em>Port2 path</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort2_path

+	 * <em>Port2 path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port2 path</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector#getPort2_path()

 	 * @see #getFunctionConnector()

@@ -2839,9 +3210,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionConnector_Port2_path();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort <em>Function Flow Port</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort <em>Function Flow Port</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Flow Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort

 	 * @generated

@@ -2849,9 +3222,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionFlowPort();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort#getType <em>Type</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort#getType

+	 * <em>Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort#getType()

 	 * @see #getFunctionFlowPort()

@@ -2863,6 +3238,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -2872,6 +3248,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort <em>Function Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort

 	 * @generated

@@ -2879,9 +3256,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionPort();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort <em>Function Power Port</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort

+	 * <em>Function Power Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Power Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort

 	 * @generated

@@ -2889,9 +3268,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionPowerPort();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port <em>Base Port</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port

+	 * <em>Base Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getBase_Port()

 	 * @see #getFunctionPowerPort()

@@ -2900,9 +3281,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionPowerPort_Base_Port();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getType <em>Type</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getType

+	 * <em>Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort#getType()

 	 * @see #getFunctionPowerPort()

@@ -2911,9 +3294,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionPowerPort_Type();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype <em>Function Prototype</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype <em>Function Prototype</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Prototype</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype

 	 * @generated

@@ -2921,9 +3306,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionPrototype();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property <em>Base Property</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property

+	 * <em>Base Property</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Property</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype#getBase_Property()

 	 * @see #getFunctionPrototype()

@@ -2935,6 +3322,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType <em>Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Function Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType

 	 * @generated

@@ -2942,9 +3330,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getFunctionType();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getConnector <em>Connector</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getConnector

+	 * <em>Connector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Connector</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getConnector()

 	 * @see #getFunctionType()

@@ -2953,9 +3343,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionType_Connector();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#isIsElementary <em>Is Elementary</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#isIsElementary

+	 * <em>Is Elementary</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Elementary</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#isIsElementary()

 	 * @see #getFunctionType()

@@ -2964,9 +3356,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EAttribute getFunctionType_IsElementary();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPort <em>Port</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPort

+	 * <em>Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPort()

 	 * @see #getFunctionType()

@@ -2975,9 +3369,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionType_Port();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPortGroup <em>Port Group</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPortGroup

+	 * <em>Port Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType#getPortGroup()

 	 * @see #getFunctionType()

@@ -2986,9 +3382,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getFunctionType_PortGroup();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType <em>Hardware Function Type</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType

+	 * <em>Hardware Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Hardware Function Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType

 	 * @generated

@@ -2996,9 +3394,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getHardwareFunctionType();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent <em>Hardware Component</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent <em>Hardware Component</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Hardware Component</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent()

 	 * @see #getHardwareFunctionType()

@@ -3007,8 +3407,10 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getHardwareFunctionType_HardwareComponent();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager <em>Local Device Manager</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager

+	 * <em>Local Device Manager</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Local Device Manager</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager

 	 * @generated

@@ -3019,6 +3421,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation <em>Operation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Operation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation

 	 * @generated

@@ -3026,9 +3429,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getOperation();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation <em>Base Operation</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation

+	 * <em>Base Operation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Operation</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation()

 	 * @see #getOperation()

@@ -3037,9 +3442,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getOperation_Base_Operation();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getArgument <em>Argument</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getArgument

+	 * <em>Argument</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Argument</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getArgument()

 	 * @see #getOperation()

@@ -3051,6 +3458,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getReturn <em>Return</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Return</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getReturn()

 	 * @see #getOperation()

@@ -3062,6 +3470,7 @@ public interface FunctionmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup <em>Port Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Port Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup

 	 * @generated

@@ -3069,9 +3478,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EClass getPortGroup();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPort <em>Port</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPort <em>Port</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPort()

 	 * @see #getPortGroup()

@@ -3080,9 +3491,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getPortGroup_Port();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class()

 	 * @see #getPortGroup()

@@ -3091,9 +3504,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getPortGroup_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port <em>Base Port</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port

+	 * <em>Base Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Port</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port()

 	 * @see #getPortGroup()

@@ -3102,9 +3517,11 @@ public interface FunctionmodelingPackage extends EPackage {
 	EReference getPortGroup_Base_Port();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPortGroup <em>Port Group</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPortGroup

+	 * <em>Port Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Port Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPortGroup()

 	 * @see #getPortGroup()

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/HardwareFunctionType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/HardwareFunctionType.java
index 15dc0a16f51..3b2141bad6b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/HardwareFunctionType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/HardwareFunctionType.java
@@ -21,47 +21,54 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentT
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Function Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The HardwareFunctionType is the transfer function for the identified HardwareComponentType or a specification of an intended transfer function. HardwareFunctionType types DesignFunctionPrototypes in the FunctionalDesignArchitecture. The DesignFunctionPrototype is typically the end of the ClampConnector on DesignLevel.
+ * The HardwareFunctionType is the transfer function for the identified HardwareComponentType or a specification of an intended transfer function.
+ * HardwareFunctionType types DesignFunctionPrototypes in the FunctionalDesignArchitecture. The DesignFunctionPrototype is typically the end of the
+ * ClampConnector on DesignLevel.
  * 
- * Prototypes typed by HardwareComponentType may be allocated to HardwareComponents in which case the HardwareFunctionType must match the HardwareFunctionType of the target HardwareComponent.
+ * Prototypes typed by HardwareComponentType may be allocated to HardwareComponents in which case the HardwareFunctionType must match the
+ * HardwareFunctionType of the target HardwareComponent.
  * 
- * DesignFunctionPrototypes typed by HardwareFunctionType may be allocated to HardwareComponents in which case the HardwareFunctionType must match the HardwareFunctionType of the target HardwareComponent.
+ * DesignFunctionPrototypes typed by HardwareFunctionType may be allocated to HardwareComponents in which case the HardwareFunctionType must match the
+ * HardwareFunctionType of the target HardwareComponent.
  * 
  * Constraints:
- * [1] A DesignFunctionPrototype typed by a HardwareFunctionType shall be connected to the EnvironmentModel via ClampConnectors and to BSWFunctions via FunctionConnectors.
+ * [1] A DesignFunctionPrototype typed by a HardwareFunctionType shall be connected to the EnvironmentModel via ClampConnectors and to BSWFunctions
+ * via FunctionConnectors.
  * 
- * Semantics: 
- * The HardwareFunctionHardwareFunctionType is the transfer function for hardware components such as sensors, actuators, amplifiers, etc or a specification of an intended transfer function. 
+ * Semantics:
+ * The HardwareFunctionHardwareFunctionType is the transfer function for hardware components such as sensors, actuators, amplifiers, etc or a
+ * specification of an intended transfer function.
  * 
  * HardwareFunctions can be allocated to Sensors or Actuators, i.e. the interfacing element to the plant model.
  * 
  * 
- * Extension: 
+ * Extension:
  * UML Class, specialization of SysML::Block
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent <em>Hardware Component</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent <em>Hardware Component</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getHardwareFunctionType()
  * @model
  * @generated
  */
 public interface HardwareFunctionType extends DesignFunctionType {
+
 	/**
 	 * Returns the value of the '<em><b>Hardware Component</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hardware Component</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hardware Component</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hardware Component</em>' reference.
 	 * @see #setHardwareComponent(HardwareComponentType)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getHardwareFunctionType_HardwareComponent()
@@ -71,10 +78,13 @@ public interface HardwareFunctionType extends DesignFunctionType {
 	HardwareComponentType getHardwareComponent();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent <em>Hardware Component</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType#getHardwareComponent
+	 * <em>Hardware Component</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hardware Component</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Hardware Component</em>' reference.
 	 * @see #getHardwareComponent()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/LocalDeviceManager.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/LocalDeviceManager.java
index df4f22eb81f..2bd23db79f4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/LocalDeviceManager.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/LocalDeviceManager.java
@@ -16,11 +16,16 @@
 package org.eclipse.papyrus.eastadl.structure.functionmodeling;

 

 /**

- * <!-- begin-user-doc --> A representation of the model object '

- * <em><b>Local Device Manager</b></em>'. <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Local Device Manager</b></em>'. <!-- end-user-doc -->

+ * 

  * <!-- begin-model-doc -->

- * The LocalDeviceManager represents a DesignFunction that act as a manager or functional interface to Sensors, Actuators and other devices. It is responsible fort translating between the electrical/logical interface of the device, as provided by a BasicSoftwareFunction, and the physical interface of the device. For example, consider a temperature sensor with voltage output. The HardwareFunctionType defines the transfer from temperature to voltage. A BasicSoftwareFunction relays the voltage from the microcontroller’s I/O. The role of the LocalDeviceManager is now to translate from voltage to temperature value, taking into account the sensor’s characteristics such as nonlinearities, calibration, etc. The resulting temperature is available to the other DesignFunctions. By separating the device specific part from the middleware and ECU specific parts, it is possible to systematically change interface function together with the device. 

+ * The LocalDeviceManager represents a DesignFunction that act as a manager or functional interface to Sensors, Actuators and other devices. It is

+ * responsible fort translating between the electrical/logical interface of the device, as provided by a BasicSoftwareFunction, and the physical

+ * interface of the device. For example, consider a temperature sensor with voltage output. The HardwareFunctionType defines the transfer from

+ * temperature to voltage. A BasicSoftwareFunction relays the voltage from the microcontroller’s I/O. The role of the LocalDeviceManager is now to

+ * translate from voltage to temperature value, taking into account the sensor’s characteristics such as nonlinearities, calibration, etc. The

+ * resulting temperature is available to the other DesignFunctions. By separating the device specific part from the middleware and ECU specific parts,

+ * it is possible to systematically change interface function together with the device.

  * 

  * 

  * Semantics:

@@ -32,13 +37,13 @@ package org.eclipse.papyrus.eastadl.structure.functionmodeling;
  * 

  * [2] A LocalDeviceManager may only interface either Sensors or Actuators.

  * 

- * [3] A LocalDeviceManager shall interface BSWFunctions and DesignFunctions. 

+ * [3] A LocalDeviceManager shall interface BSWFunctions and DesignFunctions.

  * 

  * 

  * Extension: Class, specialization of SysML::Block

  * <!-- end-model-doc -->

- *

- *

+ * 

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getLocalDeviceManager()

  * @model

  * @generated

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Operation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Operation.java
index 1e741772c08..35419445fbe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Operation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/Operation.java
@@ -24,38 +24,40 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Operation</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Operation is the provided/required operation of a FunctionClientServerInterface. It can specify its return values and arguments by EADatatypePrototypes.
+ * The Operation is the provided/required operation of a FunctionClientServerInterface. It can specify its return values and arguments by
+ * EADatatypePrototypes.
  * 
- * Semantics: 
+ * Semantics:
  * The Operation is the provided/required operation of a FunctionClientServerInterface.
  * 
  * Extension: UML Operation
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation <em>Base Operation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getArgument <em>Argument</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getReturn <em>Return</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation <em>Base Operation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getArgument <em>Argument</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getReturn <em>Return</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getOperation()
  * @model
  * @generated
  */
 public interface Operation extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Operation</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Operation</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Operation</em>' reference.
 	 * @see #setBase_Operation(org.eclipse.uml2.uml.Operation)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getOperation_Base_Operation()
@@ -65,10 +67,13 @@ public interface Operation extends EAElement {
 	org.eclipse.uml2.uml.Operation getBase_Operation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation <em>Base Operation</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation#getBase_Operation <em>Base Operation</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Operation</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Operation</em>' reference.
 	 * @see #getBase_Operation()
 	 * @generated
 	 */
@@ -79,10 +84,10 @@ public interface Operation extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.infrastructure.datatypes.EADatatypePrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Argument</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Argument</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Argument</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getOperation_Argument()
 	 * @model transient="true" changeable="false" volatile="true" derived="true"
@@ -94,10 +99,10 @@ public interface Operation extends EAElement {
 	 * Returns the value of the '<em><b>Return</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Return</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Return</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Return</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getOperation_Return()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/PortGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/PortGroup.java
index 20726ad7553..708a8cbea16 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/PortGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/PortGroup.java
@@ -24,31 +24,36 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Port Group</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The ADLPortGroup metaclass is used to collapse several ports to one. All ports that are part of a port group are graphically represented as a single port. Connectors connected to ports of a port group pair are graphically collapsed to a single line.
- * The ADLPortGroup has no semantic meaning except that it makes graphical representation of the connected ports easier to read, and provides a means to logically organize several ports to one group.
- * Connectors are still connected to the contained ports, but tool support may simplify connections by allowing semi-automatic or automatic connection to all ports of a port group. 
+ * The ADLPortGroup metaclass is used to collapse several ports to one. All ports that are part of a port group are graphically represented as a
+ * single port. Connectors connected to ports of a port group pair are graphically collapsed to a single line.
+ * The ADLPortGroup has no semantic meaning except that it makes graphical representation of the connected ports easier to read, and provides a means
+ * to logically organize several ports to one group.
+ * Connectors are still connected to the contained ports, but tool support may simplify connections by allowing semi-automatic or automatic connection
+ * to all ports of a port group.
  * 
  * Semantics:
- * The ADLPortGroup provides a means to organize ports and connectors. It does not add semantics. In the model, the ports contained in the port group are connected as individual ports.
+ * The ADLPortGroup provides a means to organize ports and connectors. It does not add semantics. In the model, the ports contained in the port group
+ * are connected as individual ports.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getPortGroup <em>Port Group</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getPortGroup()
  * @model
  * @generated
  */
 public interface PortGroup extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Port</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort}.
@@ -56,8 +61,10 @@ public interface PortGroup extends EAElement {
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * The grouped ports.
-	 * {derived from UML::EncapsulatedClassifier::ownedPort} when this stereotype is applied on a Class. When the stereotype is applied on a Port the value is derived from the ports in the type.
+	 * {derived from UML::EncapsulatedClassifier::ownedPort} when this stereotype is applied on a Class. When the stereotype is applied on a Port the
+	 * value is derived from the ports in the type.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getPortGroup_Port()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -69,10 +76,10 @@ public interface PortGroup extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getPortGroup_Base_Class()
@@ -85,7 +92,9 @@ public interface PortGroup extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -95,10 +104,10 @@ public interface PortGroup extends EAElement {
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getPortGroup_Base_Port()
@@ -111,7 +120,9 @@ public interface PortGroup extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup#getBase_Port <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
@@ -122,10 +133,10 @@ public interface PortGroup extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#getPortGroup_PortGroup()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocateableElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocateableElementImpl.java
index 26de1d8f3af..4ee96ff444e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocateableElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocateableElementImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AllocateableElementImpl extends EObjectImpl implements AllocateableElement {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AllocateableElementImpl() {
@@ -43,6 +45,7 @@ public abstract class AllocateableElementImpl extends EObjectImpl implements All
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocationImpl.java
index 393584f61d6..e6d20e16f53 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AllocationImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getFunctionAllocation <em>Function Allocation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AllocationImpl#getFunctionAllocation <em>Function Allocation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AllocationImpl extends EAElementImpl implements Allocation {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	 * The cached value of the '{@link #getFunctionAllocation() <em>Function Allocation</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionAllocation()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AllocationImpl() {
@@ -87,19 +92,22 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
-				return getFunctionAllocation();
+		switch(featureID) {
+		case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
+			return getFunctionAllocation();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +115,18 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
-				return base_Class != null;
-			case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
-				return base_Package != null;
-			case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
-				return functionAllocation != null && !functionAllocation.isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
+			return base_Class != null;
+		case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
+			return base_Package != null;
+		case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
+			return functionAllocation != null && !functionAllocation.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,22 +134,23 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
-				getFunctionAllocation().clear();
-				getFunctionAllocation().addAll((Collection<? extends FunctionAllocation>)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
+			getFunctionAllocation().clear();
+			getFunctionAllocation().addAll((Collection<? extends FunctionAllocation>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,14 +169,15 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.ALLOCATION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -175,6 +187,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -184,26 +197,28 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.ALLOCATION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -213,6 +228,7 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -222,32 +238,34 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
-				getFunctionAllocation().clear();
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.ALLOCATION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case FunctionmodelingPackage.ALLOCATION__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION:
+			getFunctionAllocation().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,10 +273,11 @@ public class AllocationImpl extends EAElementImpl implements Allocation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionAllocation> getFunctionAllocation() {
-		if (functionAllocation == null) {
+		if(functionAllocation == null) {
 			functionAllocation = new EObjectResolvingEList<FunctionAllocation>(FunctionAllocation.class, this, FunctionmodelingPackage.ALLOCATION__FUNCTION_ALLOCATION);
 		}
 		return functionAllocation;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionPrototypeImpl.java
index 143d17e4c4b..ab7287d2ddd 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionPrototypeImpl.java
@@ -34,16 +34,17 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionPrototypeImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnalysisFunctionPrototypeImpl extends FunctionPrototypeImpl implements AnalysisFunctionPrototype {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnalysisFunctionPrototypeImpl() {
@@ -63,7 +64,7 @@ public class AnalysisFunctionPrototypeImpl extends FunctionPrototypeImpl impleme
 			// Retrieve the type of the ADLFunctionPrototype
 			Type basicType = getBase_Property().getType();
 
-			
+
 			if(basicType != null) {
 				type = (AnalysisFunctionType)UMLUtil.getStereotypeApplication(basicType, AnalysisFunctionType.class);
 			}
@@ -74,33 +75,37 @@ public class AnalysisFunctionPrototypeImpl extends FunctionPrototypeImpl impleme
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		switch(featureID) {
+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE__TYPE:
-				return basicGetType() != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE__TYPE:
+			return basicGetType() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -141,6 +146,7 @@ public class AnalysisFunctionPrototypeImpl extends FunctionPrototypeImpl impleme
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisFunctionType getType() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionTypeImpl.java
index c1399adf819..6bb645b0cca 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/AnalysisFunctionTypeImpl.java
@@ -36,16 +36,17 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.AnalysisFunctionTypeImpl#getPart <em>Part</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnalysisFunctionTypeImpl extends FunctionTypeImpl implements AnalysisFunctionType {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnalysisFunctionTypeImpl() {
@@ -54,32 +55,35 @@ public class AnalysisFunctionTypeImpl extends FunctionTypeImpl implements Analys
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE__PART:
-				return getPart();
+		switch(featureID) {
+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE__PART:
+			return getPart();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE__PART:
-				return !getPart().isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE__PART:
+			return !getPart().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,8 +127,7 @@ public class AnalysisFunctionTypeImpl extends FunctionTypeImpl implements Analys
 			while(itDep.hasNext()) {
 				Property currentProperty = itDep.next();
 
-				currentFunctionPrototype = (AnalysisFunctionPrototype)UMLUtil.getStereotypeApplication(currentProperty,
-					AnalysisFunctionPrototype.class);
+				currentFunctionPrototype = (AnalysisFunctionPrototype)UMLUtil.getStereotypeApplication(currentProperty, AnalysisFunctionPrototype.class);
 
 				if(currentFunctionPrototype != null) {
 					parts.add(currentFunctionPrototype);
@@ -133,8 +136,7 @@ public class AnalysisFunctionTypeImpl extends FunctionTypeImpl implements Analys
 		}
 
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<AnalysisFunctionPrototype>(AnalysisFunctionPrototype.class, parts.size(), parts
-			.toArray());
+		return new BasicInternalEList<AnalysisFunctionPrototype>(AnalysisFunctionPrototype.class, parts.size(), parts.toArray());
 	}
 
 	/**
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/BasicSoftwareFunctionTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/BasicSoftwareFunctionTypeImpl.java
index f6463e7f8e4..fc24bf56134 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/BasicSoftwareFunctionTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/BasicSoftwareFunctionTypeImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class BasicSoftwareFunctionTypeImpl extends DesignFunctionTypeImpl implements BasicSoftwareFunctionType {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BasicSoftwareFunctionTypeImpl() {
@@ -42,6 +44,7 @@ public class BasicSoftwareFunctionTypeImpl extends DesignFunctionTypeImpl implem
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionPrototypeImpl.java
index 07637b92b0c..bd82b5764ac 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionPrototypeImpl.java
@@ -34,16 +34,17 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionPrototypeImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DesignFunctionPrototypeImpl extends FunctionPrototypeImpl implements DesignFunctionPrototype {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DesignFunctionPrototypeImpl() {
@@ -73,33 +74,37 @@ public class DesignFunctionPrototypeImpl extends FunctionPrototypeImpl implement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		switch(featureID) {
+		case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE__TYPE:
-				return basicGetType() != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE__TYPE:
+			return basicGetType() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,6 +145,7 @@ public class DesignFunctionPrototypeImpl extends FunctionPrototypeImpl implement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionType getType() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionTypeImpl.java
index 3c8866367f4..fc265f2bcf9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/DesignFunctionTypeImpl.java
@@ -36,16 +36,17 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.DesignFunctionTypeImpl#getPart <em>Part</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DesignFunctionTypeImpl extends FunctionTypeImpl implements DesignFunctionType {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DesignFunctionTypeImpl() {
@@ -54,32 +55,35 @@ public class DesignFunctionTypeImpl extends FunctionTypeImpl implements DesignFu
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE__PART:
-				return getPart();
+		switch(featureID) {
+		case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE__PART:
+			return getPart();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE__PART:
-				return !getPart().isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE__PART:
+			return !getPart().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,9 +127,8 @@ public class DesignFunctionTypeImpl extends FunctionTypeImpl implements DesignFu
 			while(itDep.hasNext()) {
 				Property currentProperty = itDep.next();
 
-				currentFunctionPrototype = (DesignFunctionPrototype)UMLUtil.getStereotypeApplication(currentProperty,
-						DesignFunctionPrototype.class);
-				
+				currentFunctionPrototype = (DesignFunctionPrototype)UMLUtil.getStereotypeApplication(currentProperty, DesignFunctionPrototype.class);
+
 				if(currentFunctionPrototype != null) {
 					parts.add(currentFunctionPrototype);
 				}
@@ -133,8 +136,7 @@ public class DesignFunctionTypeImpl extends FunctionTypeImpl implements DesignFu
 		}
 
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<DesignFunctionPrototype>(DesignFunctionPrototype.class, parts.size(), parts
-			.toArray());
+		return new BasicInternalEList<DesignFunctionPrototype>(DesignFunctionPrototype.class, parts.size(), parts.toArray());
 	}
 
 	/**
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionAllocationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionAllocationImpl.java
index 0641b8a54f8..4c2e87802fe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionAllocationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionAllocationImpl.java
@@ -38,14 +38,15 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getAllocatedElement <em>Allocated Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getAllocatedElement_path <em>Allocated Element path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getTarget_path <em>Target path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getAllocatedElement <em>Allocated Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getAllocatedElement_path <em>Allocated Element path
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionAllocationImpl#getTarget_path <em>Target path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionAllocationImpl extends EAElementImpl implements FunctionAllocation {
@@ -54,6 +55,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Dependency()
 	 * @generated
 	 * @ordered
@@ -64,6 +66,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	 * The cached value of the '{@link #getAllocatedElement_path() <em>Allocated Element path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAllocatedElement_path()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	 * The cached value of the '{@link #getTarget_path() <em>Target path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget_path()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionAllocationImpl() {
@@ -108,14 +113,15 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency getBase_Dependency() {
-		if (base_Dependency != null && base_Dependency.eIsProxy()) {
+		if(base_Dependency != null && base_Dependency.eIsProxy()) {
 			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;
 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);
-			if (base_Dependency != oldBase_Dependency) {
-				if (eNotificationRequired())
+			if(base_Dependency != oldBase_Dependency) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 			}
 		}
@@ -125,6 +131,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency basicGetBase_Dependency() {
@@ -134,22 +141,24 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Dependency(Dependency newBase_Dependency) {
 		Dependency oldBase_Dependency = base_Dependency;
 		base_Dependency = newBase_Dependency;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AllocateableElement> getAllocatedElement_path() {
-		if (allocatedElement_path == null) {
+		if(allocatedElement_path == null) {
 			allocatedElement_path = new EObjectResolvingEList<AllocateableElement>(AllocateableElement.class, this, FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH);
 		}
 		return allocatedElement_path;
@@ -158,10 +167,11 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AllocationTarget> getTarget_path() {
-		if (target_path == null) {
+		if(target_path == null) {
 			target_path = new EObjectResolvingEList<AllocationTarget>(AllocationTarget.class, this, FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH);
 		}
 		return target_path;
@@ -186,74 +196,81 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET:
-				if (resolve) return getTarget();
-				return basicGetTarget();
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT:
-				if (resolve) return getAllocatedElement();
-				return basicGetAllocatedElement();
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
-				if (resolve) return getBase_Dependency();
-				return basicGetBase_Dependency();
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
-				return getAllocatedElement_path();
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
-				return getTarget_path();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET:
+			if(resolve)
+				return getTarget();
+			return basicGetTarget();
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT:
+			if(resolve)
+				return getAllocatedElement();
+			return basicGetAllocatedElement();
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
+			if(resolve)
+				return getBase_Dependency();
+			return basicGetBase_Dependency();
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
+			return getAllocatedElement_path();
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
+			return getTarget_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET:
-				return basicGetTarget() != null;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT:
-				return basicGetAllocatedElement() != null;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
-				return base_Dependency != null;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
-				return allocatedElement_path != null && !allocatedElement_path.isEmpty();
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
-				return target_path != null && !target_path.isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET:
+			return basicGetTarget() != null;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT:
+			return basicGetAllocatedElement() != null;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
+			return base_Dependency != null;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
+			return allocatedElement_path != null && !allocatedElement_path.isEmpty();
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
+			return target_path != null && !target_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
-				getAllocatedElement_path().clear();
-				getAllocatedElement_path().addAll((Collection<? extends AllocateableElement>)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
-				getTarget_path().clear();
-				getTarget_path().addAll((Collection<? extends AllocationTarget>)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
+			getAllocatedElement_path().clear();
+			getAllocatedElement_path().addAll((Collection<? extends AllocateableElement>)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
+			getTarget_path().clear();
+			getTarget_path().addAll((Collection<? extends AllocationTarget>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -263,26 +280,28 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)null);
-				return;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
-				getAllocatedElement_path().clear();
-				return;
-			case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
-				getTarget_path().clear();
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)null);
+			return;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__ALLOCATED_ELEMENT_PATH:
+			getAllocatedElement_path().clear();
+			return;
+		case FunctionmodelingPackage.FUNCTION_ALLOCATION__TARGET_PATH:
+			getTarget_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AllocateableElement getAllocatedElement() {
@@ -292,6 +311,7 @@ public class FunctionAllocationImpl extends EAElementImpl implements FunctionAll
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AllocationTarget getTarget() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerInterfaceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerInterfaceImpl.java
index fcbd8609781..d7d59ed345b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerInterfaceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerInterfaceImpl.java
@@ -37,11 +37,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl#getBase_Interface <em>Base Interface</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl#getOperation <em>Operation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl#getBase_Interface <em>Base Interface</em>}
+ * </li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerInterfaceImpl#getOperation <em>Operation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionClientServerInterfaceImpl extends EAElementImpl implements FunctionClientServerInterface {
@@ -50,13 +51,16 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 	 * The cached value of the '{@link #getBase_Interface() <em>Base Interface</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Interface()
 	 * @generated
 	 * @ordered
 	 */
 	protected Interface base_Interface;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionClientServerInterfaceImpl() {
@@ -65,51 +69,56 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
-				if (resolve) return getBase_Interface();
-				return basicGetBase_Interface();
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__OPERATION:
-				return getOperation();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
+			if(resolve)
+				return getBase_Interface();
+			return basicGetBase_Interface();
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__OPERATION:
+			return getOperation();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
-				return base_Interface != null;
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__OPERATION:
-				return !getOperation().isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
+			return base_Interface != null;
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__OPERATION:
+			return !getOperation().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
-				setBase_Interface((Interface)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
+			setBase_Interface((Interface)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,14 +129,15 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Interface getBase_Interface() {
-		if (base_Interface != null && base_Interface.eIsProxy()) {
+		if(base_Interface != null && base_Interface.eIsProxy()) {
 			InternalEObject oldBase_Interface = (InternalEObject)base_Interface;
 			base_Interface = (Interface)eResolveProxy(oldBase_Interface);
-			if (base_Interface != oldBase_Interface) {
-				if (eNotificationRequired())
+			if(base_Interface != oldBase_Interface) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE, oldBase_Interface, base_Interface));
 			}
 		}
@@ -137,6 +147,7 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Interface basicGetBase_Interface() {
@@ -146,25 +157,27 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Interface(Interface newBase_Interface) {
 		Interface oldBase_Interface = base_Interface;
 		base_Interface = newBase_Interface;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE, oldBase_Interface, base_Interface));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
-				setBase_Interface((Interface)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE__BASE_INTERFACE:
+			setBase_Interface((Interface)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -184,9 +197,8 @@ public class FunctionClientServerInterfaceImpl extends EAElementImpl implements
 			while(itDep.hasNext()) {
 				org.eclipse.uml2.uml.Operation currentOp = itDep.next();
 
-				
-				currentOperation = (Operation)UMLUtil.getStereotypeApplication(currentOp,
-						Operation.class);
+
+				currentOperation = (Operation)UMLUtil.getStereotypeApplication(currentOp, Operation.class);
 
 				if(currentOperation != null) {
 					parts.add(currentOperation);
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerPortImpl.java
index 56dd22bb67f..0f5dc5c02b2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionClientServerPortImpl.java
@@ -34,12 +34,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getClientServerType <em>Client Server Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionClientServerPortImpl#getClientServerType <em>Client Server Type
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionClientServerPortImpl extends FunctionPortImpl implements FunctionClientServerPort {
@@ -48,6 +49,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
@@ -58,6 +60,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	 * The default value of the '{@link #getClientServerType() <em>Client Server Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClientServerType()
 	 * @generated
 	 * @ordered
@@ -68,6 +71,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	 * The cached value of the '{@link #getClientServerType() <em>Client Server Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getClientServerType()
 	 * @generated
 	 * @ordered
@@ -76,6 +80,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionClientServerPortImpl() {
@@ -94,10 +99,10 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 		if(getBase_Port() != null) {
 			Type umlType = getBase_Port().getType();
 			if(umlType != null) {
-				adlInterface = (FunctionClientServerInterface)UMLUtil.getStereotypeApplication(umlType,FunctionClientServerInterface.class);
+				adlInterface = (FunctionClientServerInterface)UMLUtil.getStereotypeApplication(umlType, FunctionClientServerInterface.class);
 			}
-			
-		
+
+
 		}
 
 		return adlInterface;
@@ -106,14 +111,15 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -123,6 +129,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -132,70 +139,77 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
-				return getClientServerType();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
+			return getClientServerType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__TYPE:
-				return basicGetType() != null;
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
-				return base_Port != null;
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
-				return clientServerType != CLIENT_SERVER_TYPE_EDEFAULT;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__TYPE:
+			return basicGetType() != null;
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
+			return base_Port != null;
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
+			return clientServerType != CLIENT_SERVER_TYPE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
-				setClientServerType((ClientServerKind)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
+			setClientServerType((ClientServerKind)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,17 +219,18 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
-				setClientServerType(CLIENT_SERVER_TYPE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE:
+			setClientServerType(CLIENT_SERVER_TYPE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -223,6 +238,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClientServerKind getClientServerType() {
@@ -231,6 +247,7 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionClientServerInterface getType() {
@@ -241,23 +258,26 @@ public class FunctionClientServerPortImpl extends FunctionPortImpl implements Fu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClientServerType(ClientServerKind newClientServerType) {
 		ClientServerKind oldClientServerType = clientServerType;
 		clientServerType = newClientServerType == null ? CLIENT_SERVER_TYPE_EDEFAULT : newClientServerType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT__CLIENT_SERVER_TYPE, oldClientServerType, clientServerType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (clientServerType: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionConnectorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionConnectorImpl.java
index 6ba17664943..3615d4c1a4b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionConnectorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionConnectorImpl.java
@@ -42,13 +42,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionConnectorImpl extends EAElementImpl implements FunctionConnector {
@@ -57,6 +57,7 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Connector()
 	 * @generated
 	 * @ordered
@@ -67,6 +68,7 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	 * The cached value of the '{@link #getPort1_path() <em>Port1 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort1_path()
 	 * @generated
 	 * @ordered
@@ -77,6 +79,7 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	 * The cached value of the '{@link #getPort2_path() <em>Port2 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort2_path()
 	 * @generated
 	 * @ordered
@@ -85,6 +88,7 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionConnectorImpl() {
@@ -93,68 +97,73 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT:
-				return getPort();
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
-				if (resolve) return getBase_Connector();
-				return basicGetBase_Connector();
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
-				return getPort1_path();
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
-				return getPort2_path();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT:
+			return getPort();
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
+			if(resolve)
+				return getBase_Connector();
+			return basicGetBase_Connector();
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
+			return getPort1_path();
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
+			return getPort2_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT:
-				return !getPort().isEmpty();
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
-				return base_Connector != null;
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
-				return port1_path != null && !port1_path.isEmpty();
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
-				return port2_path != null && !port2_path.isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT:
+			return !getPort().isEmpty();
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
+			return base_Connector != null;
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
+			return port1_path != null && !port1_path.isEmpty();
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
+			return port2_path != null && !port2_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				getPort1_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				getPort2_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			getPort1_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			getPort2_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,20 +173,21 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)null);
-				return;
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				return;
-			case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)null);
+			return;
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			return;
+		case FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -217,14 +227,15 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector getBase_Connector() {
-		if (base_Connector != null && base_Connector.eIsProxy()) {
+		if(base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
 			base_Connector = (Connector)eResolveProxy(oldBase_Connector);
-			if (base_Connector != oldBase_Connector) {
-				if (eNotificationRequired())
+			if(base_Connector != oldBase_Connector) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 			}
 		}
@@ -234,6 +245,7 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector basicGetBase_Connector() {
@@ -243,22 +255,24 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort1_path() {
-		if (port1_path == null) {
+		if(port1_path == null) {
 			port1_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT1_PATH);
 		}
 		return port1_path;
@@ -267,10 +281,11 @@ public class FunctionConnectorImpl extends EAElementImpl implements FunctionConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort2_path() {
-		if (port2_path == null) {
+		if(port2_path == null) {
 			port2_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, FunctionmodelingPackage.FUNCTION_CONNECTOR__PORT2_PATH);
 		}
 		return port2_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionFlowPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionFlowPortImpl.java
index dd69600adca..d8ed0af1501 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionFlowPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionFlowPortImpl.java
@@ -41,13 +41,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getOwnedComment <em>Owned Comment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getBase_NamedElement <em>Base Named Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getOwnedComment <em>Owned Comment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionFlowPortImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPort {
@@ -56,6 +56,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -66,6 +67,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_NamedElement()
 	 * @generated
 	 * @ordered
@@ -76,6 +78,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	 * The cached value of the '{@link #getOwnedComment() <em>Owned Comment</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedComment()
 	 * @generated
 	 * @ordered
@@ -84,6 +87,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionFlowPortImpl() {
@@ -101,7 +105,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 		if(getBase_Port() != null) {
 			Type umlType = getBase_Port().getType();
 
-			
+
 			if(umlType != null) {
 				dataType = (EADatatype)UMLUtil.getStereotypeApplication(umlType, EADatatype.class);
 			}
@@ -112,21 +116,27 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == EAElement.class) {
-			switch (derivedFeatureID) {
-				case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME: return ElementsPackage.EA_ELEMENT__NAME;
-				case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT: return ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT;
-				case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT: return ElementsPackage.EA_ELEMENT__OWNED_COMMENT;
-				default: return -1;
+		if(baseClass == EAElement.class) {
+			switch(derivedFeatureID) {
+			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
+				return ElementsPackage.EA_ELEMENT__NAME;
+			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
+				return ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT;
+			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
+				return ElementsPackage.EA_ELEMENT__OWNED_COMMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == FunctionPort.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
+		if(baseClass == FunctionPort.class) {
+			switch(derivedFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -134,21 +144,27 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == EAElement.class) {
-			switch (baseFeatureID) {
-				case ElementsPackage.EA_ELEMENT__NAME: return FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME;
-				case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT: return FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT;
-				case ElementsPackage.EA_ELEMENT__OWNED_COMMENT: return FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT;
-				default: return -1;
+		if(baseClass == EAElement.class) {
+			switch(baseFeatureID) {
+			case ElementsPackage.EA_ELEMENT__NAME:
+				return FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME;
+			case ElementsPackage.EA_ELEMENT__BASE_NAMED_ELEMENT:
+				return FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT;
+			case ElementsPackage.EA_ELEMENT__OWNED_COMMENT:
+				return FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT;
+			default:
+				return -1;
 			}
 		}
-		if (baseClass == FunctionPort.class) {
-			switch (baseFeatureID) {
-				default: return -1;
+		if(baseClass == FunctionPort.class) {
+			switch(baseFeatureID) {
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -156,68 +172,74 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
-				return getName();
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
-				if (resolve) return getBase_NamedElement();
-				return basicGetBase_NamedElement();
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
-				return getOwnedComment();
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
+			return getName();
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
+			if(resolve)
+				return getBase_NamedElement();
+			return basicGetBase_NamedElement();
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
+			return getOwnedComment();
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
-				return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
-				return base_NamedElement != null;
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
-				return ownedComment != null && !ownedComment.isEmpty();
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__TYPE:
-				return basicGetType() != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
+			return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
+			return base_NamedElement != null;
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
+			return ownedComment != null && !ownedComment.isEmpty();
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__TYPE:
+			return basicGetType() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
-				setName((String)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				getOwnedComment().addAll((Collection<? extends Comment>)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
+			setName((String)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			getOwnedComment().addAll((Collection<? extends Comment>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,20 +250,21 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
-				setBase_NamedElement((NamedElement)null);
-				return;
-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
-				getOwnedComment().clear();
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT:
+			setBase_NamedElement((NamedElement)null);
+			return;
+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT:
+			getOwnedComment().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -259,10 +282,11 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Comment> getOwnedComment() {
-		if (ownedComment == null) {
+		if(ownedComment == null) {
 			ownedComment = new EObjectResolvingEList<Comment>(Comment.class, this, FunctionmodelingPackage.FUNCTION_FLOW_PORT__OWNED_COMMENT);
 		}
 		return ownedComment;
@@ -270,6 +294,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatype getType() {
@@ -299,14 +324,15 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getBase_NamedElement() {
-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {
+		if(base_NamedElement != null && base_NamedElement.eIsProxy()) {
 			InternalEObject oldBase_NamedElement = (InternalEObject)base_NamedElement;
 			base_NamedElement = (NamedElement)eResolveProxy(oldBase_NamedElement);
-			if (base_NamedElement != oldBase_NamedElement) {
-				if (eNotificationRequired())
+			if(base_NamedElement != oldBase_NamedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 			}
 		}
@@ -316,6 +342,7 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetBase_NamedElement() {
@@ -325,12 +352,13 @@ public class FunctionFlowPortImpl extends FlowPortImpl implements FunctionFlowPo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_NamedElement(NamedElement newBase_NamedElement) {
 		NamedElement oldBase_NamedElement = base_NamedElement;
 		base_NamedElement = newBase_NamedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_FLOW_PORT__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPortImpl.java
index ecb2b388814..2d5e49802b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPortImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class FunctionPortImpl extends EAElementImpl implements FunctionPort {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionPortImpl() {
@@ -43,6 +45,7 @@ public abstract class FunctionPortImpl extends EAElementImpl implements Function
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPowerPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPowerPortImpl.java
index d3f8ae44a75..6c6017aad75 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPowerPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPowerPortImpl.java
@@ -32,11 +32,11 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPowerPortImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionPowerPort {
@@ -45,13 +45,16 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
 	 */
 	protected Port base_Port;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionPowerPortImpl() {
@@ -68,7 +71,7 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 
 		if(getBase_Port() != null) {
 			Type umlType = getBase_Port().getType();
-			
+
 			if(umlType != null) {
 				dataType = (CompositeDatatype)UMLUtil.getStereotypeApplication(umlType, CompositeDatatype.class);
 			}
@@ -79,52 +82,58 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
-				return base_Port != null;
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__TYPE:
-				return basicGetType() != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
+			return base_Port != null;
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__TYPE:
+			return basicGetType() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,14 +144,15 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -152,6 +162,7 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -161,31 +172,34 @@ public class FunctionPowerPortImpl extends FunctionPortImpl implements FunctionP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_POWER_PORT__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CompositeDatatype getType() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPrototypeImpl.java
index 8653aa084a4..9cfbaed635c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionPrototypeImpl.java
@@ -34,10 +34,10 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class FunctionPrototypeImpl extends EAElementImpl implements FunctionPrototype {
@@ -46,13 +46,16 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
 	 */
 	protected Property base_Property;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionPrototypeImpl() {
@@ -73,7 +76,7 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 			Type basicType = getBase_Property().getType();
 
 			if(basicType != null) {
-				
+
 				type = (FunctionType)UMLUtil.getStereotypeApplication(basicType, FunctionType.class);
 			}
 		}
@@ -83,48 +86,53 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
-				return base_Property != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
+			return base_Property != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	
+
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,14 +143,15 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -152,6 +161,7 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -161,25 +171,27 @@ public abstract class FunctionPrototypeImpl extends EAElementImpl implements Fun
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionTypeImpl.java
index af2c9d566d5..392b4575e09 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionTypeImpl.java
@@ -47,15 +47,15 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#isEncapsulated <em>Is Encapsulated</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#isIsElementary <em>Is Elementary</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getPortGroup <em>Port Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getConnector <em>Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#isEncapsulated <em>Is Encapsulated</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#isIsElementary <em>Is Elementary</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.FunctionTypeImpl#getConnector <em>Connector</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class FunctionTypeImpl extends ContextImpl implements FunctionType {
@@ -63,6 +63,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 	/**
 	 * The default value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isEncapsulated()
 	 * @generated
 	 * @ordered
@@ -72,6 +73,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 	/**
 	 * The cached value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isEncapsulated()
 	 * @generated
 	 * @ordered
@@ -100,6 +102,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FunctionTypeImpl() {
@@ -108,6 +111,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -116,15 +120,19 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Block.class) {
-			switch (derivedFeatureID) {
-				case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED: return BlocksPackage.BLOCK__IS_ENCAPSULATED;
-				case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS: return BlocksPackage.BLOCK__BASE_CLASS;
-				default: return -1;
+		if(baseClass == Block.class) {
+			switch(derivedFeatureID) {
+			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
+				return BlocksPackage.BLOCK__IS_ENCAPSULATED;
+			case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
+				return BlocksPackage.BLOCK__BASE_CLASS;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -132,15 +140,19 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Block.class) {
-			switch (baseFeatureID) {
-				case BlocksPackage.BLOCK__IS_ENCAPSULATED: return FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED;
-				case BlocksPackage.BLOCK__BASE_CLASS: return FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS;
-				default: return -1;
+		if(baseClass == Block.class) {
+			switch(baseFeatureID) {
+			case BlocksPackage.BLOCK__IS_ENCAPSULATED:
+				return FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED;
+			case BlocksPackage.BLOCK__BASE_CLASS:
+				return FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -148,70 +160,75 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
-				return isEncapsulated();
-			case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ELEMENTARY:
-				return isIsElementary();
-			case FunctionmodelingPackage.FUNCTION_TYPE__PORT:
-				return getPort();
-			case FunctionmodelingPackage.FUNCTION_TYPE__PORT_GROUP:
-				return getPortGroup();
-			case FunctionmodelingPackage.FUNCTION_TYPE__CONNECTOR:
-				return getConnector();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
+			return isEncapsulated();
+		case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ELEMENTARY:
+			return isIsElementary();
+		case FunctionmodelingPackage.FUNCTION_TYPE__PORT:
+			return getPort();
+		case FunctionmodelingPackage.FUNCTION_TYPE__PORT_GROUP:
+			return getPortGroup();
+		case FunctionmodelingPackage.FUNCTION_TYPE__CONNECTOR:
+			return getConnector();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
-				return isEncapsulated != IS_ENCAPSULATED_EDEFAULT;
-			case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
-				return base_Class != null;
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ELEMENTARY:
-				return isIsElementary() != IS_ELEMENTARY_EDEFAULT;
-			case FunctionmodelingPackage.FUNCTION_TYPE__PORT:
-				return !getPort().isEmpty();
-			case FunctionmodelingPackage.FUNCTION_TYPE__PORT_GROUP:
-				return !getPortGroup().isEmpty();
-			case FunctionmodelingPackage.FUNCTION_TYPE__CONNECTOR:
-				return !getConnector().isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
+			return isEncapsulated != IS_ENCAPSULATED_EDEFAULT;
+		case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
+			return base_Class != null;
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ELEMENTARY:
+			return isIsElementary() != IS_ELEMENTARY_EDEFAULT;
+		case FunctionmodelingPackage.FUNCTION_TYPE__PORT:
+			return !getPort().isEmpty();
+		case FunctionmodelingPackage.FUNCTION_TYPE__PORT_GROUP:
+			return !getPortGroup().isEmpty();
+		case FunctionmodelingPackage.FUNCTION_TYPE__CONNECTOR:
+			return !getConnector().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
-				setIsEncapsulated((Boolean)newValue);
-				return;
-			case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
+			setIsEncapsulated((Boolean)newValue);
+			return;
+		case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -222,6 +239,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isEncapsulated() {
@@ -230,31 +248,33 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
-				setIsEncapsulated(IS_ENCAPSULATED_EDEFAULT);
-				return;
-			case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED:
+			setIsEncapsulated(IS_ENCAPSULATED_EDEFAULT);
+			return;
+		case FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -278,8 +298,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 				Connector currentConnector = itDep.next();
 
 				// Test if currentProperty is stereotyped ADLFunctionPrototype
-				currentConnectorPrototype = (FunctionConnector)UMLUtil.getStereotypeApplication(currentConnector,
-					FunctionConnector.class);
+				currentConnectorPrototype = (FunctionConnector)UMLUtil.getStereotypeApplication(currentConnector, FunctionConnector.class);
 
 				if(currentConnectorPrototype != null) {
 					connectors.add(currentConnectorPrototype);
@@ -288,8 +307,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 		}
 
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<FunctionConnector>(FunctionConnector.class, connectors.size(), connectors
-			.toArray());
+		return new BasicInternalEList<FunctionConnector>(FunctionConnector.class, connectors.size(), connectors.toArray());
 	}
 
 	/**
@@ -330,8 +348,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 				Port currentPort = itDep.next();
 
 				// Test if currentPort is stereotyped FlowPort
-				currentADLFlowPort = (FunctionPort)UMLUtil.getStereotypeApplication(currentPort,
-					FunctionPort.class);
+				currentADLFlowPort = (FunctionPort)UMLUtil.getStereotypeApplication(currentPort, FunctionPort.class);
 
 				if(currentADLFlowPort != null) {
 					groupedPorts.add(currentADLFlowPort);
@@ -360,8 +377,7 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 				Classifier currentClass = itDep.next();
 
 				// Test if currentPort is stereotyped ADLFlowPort
-				currentADLPortGroup = (PortGroup)UMLUtil.getStereotypeApplication(currentClass,
-					PortGroup.class);
+				currentADLPortGroup = (PortGroup)UMLUtil.getStereotypeApplication(currentClass, PortGroup.class);
 
 				if(currentADLPortGroup != null) {
 					portGroups.add(currentADLPortGroup);
@@ -384,33 +400,37 @@ public abstract class FunctionTypeImpl extends ContextImpl implements FunctionTy
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsEncapsulated(boolean newIsEncapsulated) {
 		boolean oldIsEncapsulated = isEncapsulated;
 		isEncapsulated = newIsEncapsulated;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.FUNCTION_TYPE__IS_ENCAPSULATED, oldIsEncapsulated, isEncapsulated));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isEncapsulated: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionalDeviceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionalDeviceImpl.java
index 06576f6eb13..06075c06aba 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionalDeviceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionalDeviceImpl.java
@@ -21,17 +21,17 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Functional Device</b></em>

- * '. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Functional Device</b></em> '. <!-- end-user-doc -->

  * <p>

  * </p>

- *

+ * 

  * @generated

  */

 public class FunctionalDeviceImpl extends AnalysisFunctionTypeImpl implements FunctionalDevice {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FunctionalDeviceImpl() {

@@ -40,6 +40,7 @@ public class FunctionalDeviceImpl extends AnalysisFunctionTypeImpl implements Fu
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingFactoryImpl.java
index 88ecd36eacc..37284d1b6ca 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.structure.functionmodeling.*;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType;

@@ -46,12 +47,14 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FunctionmodelingFactoryImpl extends EFactoryImpl implements FunctionmodelingFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -63,16 +66,16 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static FunctionmodelingFactory init() {

 		try {

 			FunctionmodelingFactory theFunctionmodelingFactory = (FunctionmodelingFactory)EPackage.Registry.INSTANCE.getEFactory(FunctionmodelingPackage.eNS_URI);

-			if (theFunctionmodelingFactory != null) {

+			if(theFunctionmodelingFactory != null) {

 				return theFunctionmodelingFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new FunctionmodelingFactoryImpl();

@@ -81,6 +84,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingFactoryImpl() {

@@ -90,6 +94,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertClientServerKindToString(EDataType eDataType, Object instanceValue) {

@@ -99,17 +104,20 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EADirectionKind createEADirectionKindFromString(EDataType eDataType, String initialValue) {

 		EADirectionKind result = EADirectionKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertEADirectionKindToString(EDataType eDataType, Object instanceValue) {

@@ -119,52 +127,72 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case FunctionmodelingPackage.CLIENT_SERVER_KIND:

-				return convertClientServerKindToString(eDataType, instanceValue);

-			case FunctionmodelingPackage.EA_DIRECTION_KIND:

-				return convertEADirectionKindToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case FunctionmodelingPackage.CLIENT_SERVER_KIND:

+			return convertClientServerKindToString(eDataType, instanceValue);

+		case FunctionmodelingPackage.EA_DIRECTION_KIND:

+			return convertEADirectionKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case FunctionmodelingPackage.LOCAL_DEVICE_MANAGER: return createLocalDeviceManager();

-			case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE: return createDesignFunctionType();

-			case FunctionmodelingPackage.PORT_GROUP: return createPortGroup();

-			case FunctionmodelingPackage.FUNCTION_CONNECTOR: return createFunctionConnector();

-			case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE: return createDesignFunctionPrototype();

-			case FunctionmodelingPackage.FUNCTIONAL_DEVICE: return createFunctionalDevice();

-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE: return createAnalysisFunctionType();

-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE: return createAnalysisFunctionPrototype();

-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT: return createFunctionFlowPort();

-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT: return createFunctionClientServerPort();

-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE: return createFunctionClientServerInterface();

-			case FunctionmodelingPackage.OPERATION: return createOperation();

-			case FunctionmodelingPackage.BASIC_SOFTWARE_FUNCTION_TYPE: return createBasicSoftwareFunctionType();

-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE: return createHardwareFunctionType();

-			case FunctionmodelingPackage.FUNCTION_ALLOCATION: return createFunctionAllocation();

-			case FunctionmodelingPackage.ALLOCATION: return createAllocation();

-			case FunctionmodelingPackage.FUNCTION_POWER_PORT: return createFunctionPowerPort();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case FunctionmodelingPackage.LOCAL_DEVICE_MANAGER:

+			return createLocalDeviceManager();

+		case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE:

+			return createDesignFunctionType();

+		case FunctionmodelingPackage.PORT_GROUP:

+			return createPortGroup();

+		case FunctionmodelingPackage.FUNCTION_CONNECTOR:

+			return createFunctionConnector();

+		case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE:

+			return createDesignFunctionPrototype();

+		case FunctionmodelingPackage.FUNCTIONAL_DEVICE:

+			return createFunctionalDevice();

+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE:

+			return createAnalysisFunctionType();

+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE:

+			return createAnalysisFunctionPrototype();

+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT:

+			return createFunctionFlowPort();

+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT:

+			return createFunctionClientServerPort();

+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE:

+			return createFunctionClientServerInterface();

+		case FunctionmodelingPackage.OPERATION:

+			return createOperation();

+		case FunctionmodelingPackage.BASIC_SOFTWARE_FUNCTION_TYPE:

+			return createBasicSoftwareFunctionType();

+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE:

+			return createHardwareFunctionType();

+		case FunctionmodelingPackage.FUNCTION_ALLOCATION:

+			return createFunctionAllocation();

+		case FunctionmodelingPackage.ALLOCATION:

+			return createAllocation();

+		case FunctionmodelingPackage.FUNCTION_POWER_PORT:

+			return createFunctionPowerPort();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Allocation createAllocation() {

@@ -175,6 +203,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AnalysisFunctionPrototype createAnalysisFunctionPrototype() {

@@ -185,6 +214,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AnalysisFunctionType createAnalysisFunctionType() {

@@ -195,6 +225,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public BasicSoftwareFunctionType createBasicSoftwareFunctionType() {

@@ -205,17 +236,20 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ClientServerKind createClientServerKindFromString(EDataType eDataType, String initialValue) {

 		ClientServerKind result = ClientServerKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DesignFunctionPrototype createDesignFunctionPrototype() {

@@ -226,6 +260,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DesignFunctionType createDesignFunctionType() {

@@ -236,22 +271,24 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case FunctionmodelingPackage.CLIENT_SERVER_KIND:

-				return createClientServerKindFromString(eDataType, initialValue);

-			case FunctionmodelingPackage.EA_DIRECTION_KIND:

-				return createEADirectionKindFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case FunctionmodelingPackage.CLIENT_SERVER_KIND:

+			return createClientServerKindFromString(eDataType, initialValue);

+		case FunctionmodelingPackage.EA_DIRECTION_KIND:

+			return createEADirectionKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionalDevice createFunctionalDevice() {

@@ -262,6 +299,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionAllocation createFunctionAllocation() {

@@ -272,6 +310,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionClientServerInterface createFunctionClientServerInterface() {

@@ -282,6 +321,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionClientServerPort createFunctionClientServerPort() {

@@ -292,6 +332,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionConnector createFunctionConnector() {

@@ -302,6 +343,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionFlowPort createFunctionFlowPort() {

@@ -312,6 +354,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionPowerPort createFunctionPowerPort() {

@@ -322,6 +365,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public HardwareFunctionType createHardwareFunctionType() {

@@ -331,6 +375,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public LocalDeviceManager createLocalDeviceManager() {

@@ -341,6 +386,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Operation createOperation() {

@@ -351,6 +397,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public PortGroup createPortGroup() {

@@ -360,6 +407,7 @@ public class FunctionmodelingFactoryImpl extends EFactoryImpl implements Functio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingPackage getFunctionmodelingPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingPackageImpl.java
index f5f951a4363..67be00d3403 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/FunctionmodelingPackageImpl.java
@@ -109,6 +109,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FunctionmodelingPackageImpl extends EPackageImpl implements FunctionmodelingPackage {

@@ -116,6 +117,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionTypeEClass = null;

@@ -123,12 +125,14 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionPortEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -136,16 +140,18 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * 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 FunctionmodelingPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link FunctionmodelingPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static FunctionmodelingPackage init() {

-		if (isInited) return (FunctionmodelingPackage)EPackage.Registry.INSTANCE.getEPackage(FunctionmodelingPackage.eNS_URI);

+		if(isInited)

+			return (FunctionmodelingPackage)EPackage.Registry.INSTANCE.getEPackage(FunctionmodelingPackage.eNS_URI);

 

 		// Obtain or create and register package

 		FunctionmodelingPackageImpl theFunctionmodelingPackage = (FunctionmodelingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FunctionmodelingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FunctionmodelingPackageImpl());

@@ -247,7 +253,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 		// Mark meta-data to indicate it can't be changed

 		theFunctionmodelingPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(FunctionmodelingPackage.eNS_URI, theFunctionmodelingPackage);

 		return theFunctionmodelingPackage;

@@ -256,6 +262,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionConnectorEClass = null;

@@ -263,6 +270,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass analysisFunctionPrototypeEClass = null;

@@ -270,6 +278,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionFlowPortEClass = null;

@@ -277,6 +286,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionClientServerPortEClass = null;

@@ -284,6 +294,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionClientServerInterfaceEClass = null;

@@ -291,6 +302,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass operationEClass = null;

@@ -298,6 +310,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass portGroupEClass = null;

@@ -305,6 +318,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass basicSoftwareFunctionTypeEClass = null;

@@ -312,6 +326,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass hardwareFunctionTypeEClass = null;

@@ -319,6 +334,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionAllocationEClass = null;

@@ -326,6 +342,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass allocationEClass = null;

@@ -333,6 +350,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionPowerPortEClass = null;

@@ -340,6 +358,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum eaDirectionKindEEnum = null;

@@ -347,6 +366,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum clientServerKindEEnum = null;

@@ -354,6 +374,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionPrototypeEClass = null;

@@ -361,12 +382,14 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass allocateableElementEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass localDeviceManagerEClass = null;

@@ -374,6 +397,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass designFunctionTypeEClass = null;

@@ -381,12 +405,14 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass designFunctionPrototypeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass functionalDeviceEClass = null;

@@ -394,31 +420,33 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass analysisFunctionTypeEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage#eNS_URI

 	 * @see #init()

@@ -429,13 +457,15 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -526,6 +556,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getAllocateableElement() {

@@ -535,6 +566,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getAllocation() {

@@ -544,6 +576,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getAllocation_Base_Class() {

@@ -553,6 +586,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getAllocation_Base_Package() {

@@ -562,6 +596,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getAllocation_FunctionAllocation() {

@@ -571,6 +606,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getAnalysisFunctionPrototype() {

@@ -580,6 +616,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getAnalysisFunctionPrototype_Type() {

@@ -589,6 +626,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getAnalysisFunctionType() {

@@ -598,6 +636,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getAnalysisFunctionType_Part() {

@@ -607,6 +646,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getBasicSoftwareFunctionType() {

@@ -616,6 +656,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getClientServerKind() {

@@ -625,6 +666,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getEADirectionKind() {

@@ -634,6 +676,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getDesignFunctionPrototype() {

@@ -643,6 +686,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDesignFunctionPrototype_Type() {

@@ -652,6 +696,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getDesignFunctionType() {

@@ -661,6 +706,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDesignFunctionType_Part() {

@@ -669,6 +715,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionalDevice() {

@@ -678,6 +725,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionAllocation() {

@@ -687,6 +735,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionAllocation_AllocatedElement() {

@@ -696,6 +745,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionAllocation_Base_Dependency() {

@@ -705,6 +755,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionAllocation_AllocatedElement_path() {

@@ -714,6 +765,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionAllocation_Target_path() {

@@ -723,6 +775,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionAllocation_Target() {

@@ -732,6 +785,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionClientServerInterface() {

@@ -741,6 +795,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionClientServerInterface_Base_Interface() {

@@ -750,6 +805,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionClientServerInterface_Operation() {

@@ -759,6 +815,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionClientServerPort() {

@@ -768,6 +825,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionClientServerPort_ClientServerType() {

@@ -777,6 +835,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionClientServerPort_Type() {

@@ -786,6 +845,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionClientServerPort_Base_Port() {

@@ -795,6 +855,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionConnector() {

@@ -804,6 +865,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionConnector_Port() {

@@ -813,6 +875,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionConnector_Base_Connector() {

@@ -822,6 +885,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionConnector_Port1_path() {

@@ -831,6 +895,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionConnector_Port2_path() {

@@ -840,6 +905,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionFlowPort() {

@@ -849,6 +915,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionFlowPort_Type() {

@@ -857,6 +924,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingFactory getFunctionmodelingFactory() {

@@ -866,6 +934,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionPort() {

@@ -875,6 +944,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionPowerPort() {

@@ -884,6 +954,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionPowerPort_Base_Port() {

@@ -893,6 +964,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionPowerPort_Type() {

@@ -902,6 +974,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionPrototype() {

@@ -911,6 +984,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionPrototype_Base_Property() {

@@ -920,6 +994,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFunctionType() {

@@ -929,6 +1004,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionType_Connector() {

@@ -938,6 +1014,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getFunctionType_IsElementary() {

@@ -947,6 +1024,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionType_Port() {

@@ -956,6 +1034,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFunctionType_PortGroup() {

@@ -965,6 +1044,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getHardwareFunctionType() {

@@ -974,6 +1054,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getHardwareFunctionType_HardwareComponent() {

@@ -982,6 +1063,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getLocalDeviceManager() {

@@ -991,6 +1073,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getOperation() {

@@ -1000,6 +1083,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getOperation_Base_Operation() {

@@ -1009,6 +1093,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getOperation_Argument() {

@@ -1018,6 +1103,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getOperation_Return() {

@@ -1027,6 +1113,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getPortGroup() {

@@ -1036,6 +1123,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPortGroup_Port() {

@@ -1045,6 +1133,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPortGroup_Base_Class() {

@@ -1054,6 +1143,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPortGroup_Base_Port() {

@@ -1063,6 +1153,7 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPortGroup_PortGroup() {

@@ -1070,13 +1161,15 @@ public class FunctionmodelingPackageImpl extends EPackageImpl implements Functio
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/HardwareFunctionTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/HardwareFunctionTypeImpl.java
index a083a4f91f6..e411f5e6f7c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/HardwareFunctionTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/HardwareFunctionTypeImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentT
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl#getHardwareComponent <em>Hardware Component</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.HardwareFunctionTypeImpl#getHardwareComponent <em>Hardware Component</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements HardwareFunctionType {
+
 	/**
 	 * The cached value of the '{@link #getHardwareComponent() <em>Hardware Component</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHardwareComponent()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwareFunctionTypeImpl() {
@@ -60,6 +63,7 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentType basicGetHardwareComponent() {
@@ -69,14 +73,16 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
-				if (resolve) return getHardwareComponent();
-				return basicGetHardwareComponent();
+		switch(featureID) {
+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
+			if(resolve)
+				return getHardwareComponent();
+			return basicGetHardwareComponent();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
-				return hardwareComponent != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
+			return hardwareComponent != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
-				setHardwareComponent((HardwareComponentType)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
+			setHardwareComponent((HardwareComponentType)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
-				setHardwareComponent((HardwareComponentType)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT:
+			setHardwareComponent((HardwareComponentType)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentType getHardwareComponent() {
-		if (hardwareComponent != null && hardwareComponent.eIsProxy()) {
+		if(hardwareComponent != null && hardwareComponent.eIsProxy()) {
 			InternalEObject oldHardwareComponent = (InternalEObject)hardwareComponent;
 			hardwareComponent = (HardwareComponentType)eResolveProxy(oldHardwareComponent);
-			if (hardwareComponent != oldHardwareComponent) {
-				if (eNotificationRequired())
+			if(hardwareComponent != oldHardwareComponent) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT, oldHardwareComponent, hardwareComponent));
 			}
 		}
@@ -155,12 +166,13 @@ public class HardwareFunctionTypeImpl extends DesignFunctionTypeImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHardwareComponent(HardwareComponentType newHardwareComponent) {
 		HardwareComponentType oldHardwareComponent = hardwareComponent;
 		hardwareComponent = newHardwareComponent;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE__HARDWARE_COMPONENT, oldHardwareComponent, hardwareComponent));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/LocalDeviceManagerImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/LocalDeviceManagerImpl.java
index 0db8b16b757..37ce65b9ed7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/LocalDeviceManagerImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/LocalDeviceManagerImpl.java
@@ -21,17 +21,17 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Local Device Manager</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Local Device Manager</b></em>'. <!-- end-user-doc -->

  * <p>

  * </p>

- *

+ * 

  * @generated

  */

 public class LocalDeviceManagerImpl extends DesignFunctionTypeImpl implements LocalDeviceManager {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected LocalDeviceManagerImpl() {

@@ -40,6 +40,7 @@ public class LocalDeviceManagerImpl extends DesignFunctionTypeImpl implements Lo
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/OperationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/OperationImpl.java
index 9adb2cb084c..cb404f476ff 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/OperationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/OperationImpl.java
@@ -38,12 +38,12 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getBase_Operation <em>Base Operation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getArgument <em>Argument</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getReturn <em>Return</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getBase_Operation <em>Base Operation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getArgument <em>Argument</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.OperationImpl#getReturn <em>Return</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OperationImpl extends EAElementImpl implements Operation {
@@ -52,13 +52,16 @@ public class OperationImpl extends EAElementImpl implements Operation {
 	 * The cached value of the '{@link #getBase_Operation() <em>Base Operation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Operation()
 	 * @generated
 	 * @ordered
 	 */
 	protected org.eclipse.uml2.uml.Operation base_Operation;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected OperationImpl() {
@@ -87,56 +90,62 @@ public class OperationImpl extends EAElementImpl implements Operation {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
-				if (resolve) return getBase_Operation();
-				return basicGetBase_Operation();
-			case FunctionmodelingPackage.OPERATION__ARGUMENT:
-				return getArgument();
-			case FunctionmodelingPackage.OPERATION__RETURN:
-				if (resolve) return getReturn();
-				return basicGetReturn();
+		switch(featureID) {
+		case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
+			if(resolve)
+				return getBase_Operation();
+			return basicGetBase_Operation();
+		case FunctionmodelingPackage.OPERATION__ARGUMENT:
+			return getArgument();
+		case FunctionmodelingPackage.OPERATION__RETURN:
+			if(resolve)
+				return getReturn();
+			return basicGetReturn();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
-				return base_Operation != null;
-			case FunctionmodelingPackage.OPERATION__ARGUMENT:
-				return !getArgument().isEmpty();
-			case FunctionmodelingPackage.OPERATION__RETURN:
-				return basicGetReturn() != null;
+		switch(featureID) {
+		case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
+			return base_Operation != null;
+		case FunctionmodelingPackage.OPERATION__ARGUMENT:
+			return !getArgument().isEmpty();
+		case FunctionmodelingPackage.OPERATION__RETURN:
+			return basicGetReturn() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
-				setBase_Operation((org.eclipse.uml2.uml.Operation)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
+			setBase_Operation((org.eclipse.uml2.uml.Operation)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,14 +156,15 @@ public class OperationImpl extends EAElementImpl implements Operation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Operation getBase_Operation() {
-		if (base_Operation != null && base_Operation.eIsProxy()) {
+		if(base_Operation != null && base_Operation.eIsProxy()) {
 			InternalEObject oldBase_Operation = (InternalEObject)base_Operation;
 			base_Operation = (org.eclipse.uml2.uml.Operation)eResolveProxy(oldBase_Operation);
-			if (base_Operation != oldBase_Operation) {
-				if (eNotificationRequired())
+			if(base_Operation != oldBase_Operation) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.OPERATION__BASE_OPERATION, oldBase_Operation, base_Operation));
 			}
 		}
@@ -164,6 +174,7 @@ public class OperationImpl extends EAElementImpl implements Operation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Operation basicGetBase_Operation() {
@@ -173,25 +184,27 @@ public class OperationImpl extends EAElementImpl implements Operation {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Operation(org.eclipse.uml2.uml.Operation newBase_Operation) {
 		org.eclipse.uml2.uml.Operation oldBase_Operation = base_Operation;
 		base_Operation = newBase_Operation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.OPERATION__BASE_OPERATION, oldBase_Operation, base_Operation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
-				setBase_Operation((org.eclipse.uml2.uml.Operation)null);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.OPERATION__BASE_OPERATION:
+			setBase_Operation((org.eclipse.uml2.uml.Operation)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,8 +225,7 @@ public class OperationImpl extends EAElementImpl implements Operation {
 				Parameter currentParameter = itDep.next();
 
 				// Test if currentProperty is stereotyped ADLFunctionPrototype
-				currentDataPrototype = (EADatatypePrototype)UMLUtil.getStereotypeApplication(currentParameter,
-					EADatatypePrototype.class);
+				currentDataPrototype = (EADatatypePrototype)UMLUtil.getStereotypeApplication(currentParameter, EADatatypePrototype.class);
 
 				if(currentDataPrototype != null) {
 					args.add(currentDataPrototype);
@@ -227,6 +239,7 @@ public class OperationImpl extends EAElementImpl implements Operation {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADatatypePrototype getReturn() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/PortGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/PortGroupImpl.java
index 6c8481da6ad..ac5da7028f0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/PortGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/impl/PortGroupImpl.java
@@ -42,13 +42,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.impl.PortGroupImpl#getPortGroup <em>Port Group</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PortGroupImpl extends EAElementImpl implements PortGroup {
@@ -57,6 +57,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -67,6 +68,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
@@ -76,6 +78,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * The cached value of the '{@link #getPortGroup() <em>Port Group</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPortGroup()
 	 * @generated
 	 * @ordered
@@ -84,6 +87,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PortGroupImpl() {
@@ -92,68 +96,74 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FunctionmodelingPackage.PORT_GROUP__PORT:
-				return getPort();
-			case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
-				return getPortGroup();
+		switch(featureID) {
+		case FunctionmodelingPackage.PORT_GROUP__PORT:
+			return getPort();
+		case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
+			return getPortGroup();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.PORT_GROUP__PORT:
-				return !getPort().isEmpty();
-			case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
-				return base_Class != null;
-			case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
-				return base_Port != null;
-			case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
-				return portGroup != null && !portGroup.isEmpty();
+		switch(featureID) {
+		case FunctionmodelingPackage.PORT_GROUP__PORT:
+			return !getPort().isEmpty();
+		case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
+			return base_Class != null;
+		case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
+			return base_Port != null;
+		case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
+			return portGroup != null && !portGroup.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
-			case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
-				getPortGroup().clear();
-				getPortGroup().addAll((Collection<? extends PortGroup>)newValue);
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
+		case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
+			getPortGroup().clear();
+			getPortGroup().addAll((Collection<? extends PortGroup>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -163,20 +173,21 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
-			case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
-				getPortGroup().clear();
-				return;
+		switch(featureID) {
+		case FunctionmodelingPackage.PORT_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case FunctionmodelingPackage.PORT_GROUP__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
+		case FunctionmodelingPackage.PORT_GROUP__PORT_GROUP:
+			getPortGroup().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,8 +209,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 				Port currentPort = itDep.next();
 
 				// Test if currentPort is stereotyped ADLFlowPort
-				currentFunctionPort = (FunctionPort)UMLUtil.getStereotypeApplication(currentPort,
-					FunctionPort.class);
+				currentFunctionPort = (FunctionPort)UMLUtil.getStereotypeApplication(currentPort, FunctionPort.class);
 
 				if(currentFunctionPort != null) {
 					groupedPorts.add(currentFunctionPort);
@@ -212,8 +222,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 			Type type = getBase_Port().getType();
 			if(type instanceof Class) {
 
-				PortGroup currentPortGroupType = (PortGroup)UMLUtil.getStereotypeApplication(type,
-						PortGroup.class);
+				PortGroup currentPortGroupType = (PortGroup)UMLUtil.getStereotypeApplication(type, PortGroup.class);
 
 				// The port type is stereotype ADLPortGroup
 				if(currentPortGroupType != null) {
@@ -228,14 +237,15 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.PORT_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -245,6 +255,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -254,26 +265,28 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.PORT_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FunctionmodelingPackage.PORT_GROUP__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -283,6 +296,7 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -292,21 +306,23 @@ public class PortGroupImpl extends EAElementImpl implements PortGroup {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, FunctionmodelingPackage.PORT_GROUP__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<PortGroup> getPortGroup() {
-		if (portGroup == null) {
+		if(portGroup == null) {
 			portGroup = new EObjectResolvingEList<PortGroup>(PortGroup.class, this, FunctionmodelingPackage.PORT_GROUP__PORT_GROUP);
 		}
 		return portGroup;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingAdapterFactory.java
index aa86990767b..4749943b0d9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

+import org.eclipse.papyrus.eastadl.structure.functionmodeling.*;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype;

@@ -48,8 +49,9 @@ import org.eclipse.papyrus.sysml.portandflows.FlowPort;
 

 

 /**

- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage

  * @generated

  */

@@ -58,6 +60,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static FunctionmodelingPackage modelPackage;

@@ -66,122 +69,150 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected FunctionmodelingSwitch<Adapter> modelSwitch = new FunctionmodelingSwitch<Adapter>() {

-			@Override

-			public Adapter caseLocalDeviceManager(LocalDeviceManager object) {

-				return createLocalDeviceManagerAdapter();

-			}

-			@Override

-			public Adapter caseDesignFunctionType(DesignFunctionType object) {

-				return createDesignFunctionTypeAdapter();

-			}

-			@Override

-			public Adapter caseFunctionType(FunctionType object) {

-				return createFunctionTypeAdapter();

-			}

-			@Override

-			public Adapter caseFunctionPort(FunctionPort object) {

-				return createFunctionPortAdapter();

-			}

-			@Override

-			public Adapter casePortGroup(PortGroup object) {

-				return createPortGroupAdapter();

-			}

-			@Override

-			public Adapter caseFunctionConnector(FunctionConnector object) {

-				return createFunctionConnectorAdapter();

-			}

-			@Override

-			public Adapter caseAllocateableElement(AllocateableElement object) {

-				return createAllocateableElementAdapter();

-			}

-			@Override

-			public Adapter caseFunctionPrototype(FunctionPrototype object) {

-				return createFunctionPrototypeAdapter();

-			}

-			@Override

-			public Adapter caseDesignFunctionPrototype(DesignFunctionPrototype object) {

-				return createDesignFunctionPrototypeAdapter();

-			}

-			@Override

-			public Adapter caseFunctionalDevice(FunctionalDevice object) {

-				return createFunctionalDeviceAdapter();

-			}

-			@Override

-			public Adapter caseAnalysisFunctionType(AnalysisFunctionType object) {

-				return createAnalysisFunctionTypeAdapter();

-			}

-			@Override

-			public Adapter caseAnalysisFunctionPrototype(AnalysisFunctionPrototype object) {

-				return createAnalysisFunctionPrototypeAdapter();

-			}

-			@Override

-			public Adapter caseFunctionFlowPort(FunctionFlowPort object) {

-				return createFunctionFlowPortAdapter();

-			}

-			@Override

-			public Adapter caseFunctionClientServerPort(FunctionClientServerPort object) {

-				return createFunctionClientServerPortAdapter();

-			}

-			@Override

-			public Adapter caseFunctionClientServerInterface(FunctionClientServerInterface object) {

-				return createFunctionClientServerInterfaceAdapter();

-			}

-			@Override

-			public Adapter caseOperation(Operation object) {

-				return createOperationAdapter();

-			}

-			@Override

-			public Adapter caseBasicSoftwareFunctionType(BasicSoftwareFunctionType object) {

-				return createBasicSoftwareFunctionTypeAdapter();

-			}

-			@Override

-			public Adapter caseHardwareFunctionType(HardwareFunctionType object) {

-				return createHardwareFunctionTypeAdapter();

-			}

-			@Override

-			public Adapter caseFunctionAllocation(FunctionAllocation object) {

-				return createFunctionAllocationAdapter();

-			}

-			@Override

-			public Adapter caseAllocation(Allocation object) {

-				return createAllocationAdapter();

-			}

-			@Override

-			public Adapter caseFunctionPowerPort(FunctionPowerPort object) {

-				return createFunctionPowerPortAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter caseBlock(Block object) {

-				return createBlockAdapter();

-			}

-			@Override

-			public Adapter caseFlowPort(FlowPort object) {

-				return createFlowPortAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseLocalDeviceManager(LocalDeviceManager object) {

+			return createLocalDeviceManagerAdapter();

+		}

+

+		@Override

+		public Adapter caseDesignFunctionType(DesignFunctionType object) {

+			return createDesignFunctionTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionType(FunctionType object) {

+			return createFunctionTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionPort(FunctionPort object) {

+			return createFunctionPortAdapter();

+		}

+

+		@Override

+		public Adapter casePortGroup(PortGroup object) {

+			return createPortGroupAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionConnector(FunctionConnector object) {

+			return createFunctionConnectorAdapter();

+		}

+

+		@Override

+		public Adapter caseAllocateableElement(AllocateableElement object) {

+			return createAllocateableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionPrototype(FunctionPrototype object) {

+			return createFunctionPrototypeAdapter();

+		}

+

+		@Override

+		public Adapter caseDesignFunctionPrototype(DesignFunctionPrototype object) {

+			return createDesignFunctionPrototypeAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionalDevice(FunctionalDevice object) {

+			return createFunctionalDeviceAdapter();

+		}

+

+		@Override

+		public Adapter caseAnalysisFunctionType(AnalysisFunctionType object) {

+			return createAnalysisFunctionTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseAnalysisFunctionPrototype(AnalysisFunctionPrototype object) {

+			return createAnalysisFunctionPrototypeAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionFlowPort(FunctionFlowPort object) {

+			return createFunctionFlowPortAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionClientServerPort(FunctionClientServerPort object) {

+			return createFunctionClientServerPortAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionClientServerInterface(FunctionClientServerInterface object) {

+			return createFunctionClientServerInterfaceAdapter();

+		}

+

+		@Override

+		public Adapter caseOperation(Operation object) {

+			return createOperationAdapter();

+		}

+

+		@Override

+		public Adapter caseBasicSoftwareFunctionType(BasicSoftwareFunctionType object) {

+			return createBasicSoftwareFunctionTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseHardwareFunctionType(HardwareFunctionType object) {

+			return createHardwareFunctionTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionAllocation(FunctionAllocation object) {

+			return createFunctionAllocationAdapter();

+		}

+

+		@Override

+		public Adapter caseAllocation(Allocation object) {

+			return createAllocationAdapter();

+		}

+

+		@Override

+		public Adapter caseFunctionPowerPort(FunctionPowerPort object) {

+			return createFunctionPowerPortAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter caseBlock(Block object) {

+			return createBlockAdapter();

+		}

+

+		@Override

+		public Adapter caseFlowPort(FlowPort object) {

+			return createFlowPortAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = FunctionmodelingPackage.eINSTANCE;

 		}

 	}

@@ -189,7 +220,9 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -199,10 +232,12 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement <em>Allocateable Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement

+	 * <em>Allocateable Element</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement

 	 * @generated

@@ -217,6 +252,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation

 	 * @generated

@@ -226,11 +262,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype <em>Analysis Function Prototype</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype

+	 * <em>Analysis Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype

 	 * @generated

@@ -240,11 +278,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType <em>Analysis Function Type</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType

+	 * <em>Analysis Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionType

 	 * @generated

@@ -254,11 +294,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType <em>Basic Software Function Type</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType

+	 * <em>Basic Software Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.BasicSoftwareFunctionType

 	 * @generated

@@ -273,6 +315,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.sysml.blocks.Block

 	 * @generated

@@ -287,6 +330,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -296,11 +340,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype <em>Design Function Prototype</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype

+	 * <em>Design Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionPrototype

 	 * @generated

@@ -310,11 +356,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType <em>Design Function Type</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType

+	 * <em>Design Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType

 	 * @generated

@@ -327,6 +375,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -335,8 +384,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link com.cea.papyrus.uml4sysml.sysml.portandflows.FlowPort <em>Flow Port</em>}'. <!--

+	 * Creates a new adapter for an object of class ' {@link com.cea.papyrus.uml4sysml.sysml.portandflows.FlowPort <em>Flow Port</em>}'. <!--

 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore

 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--

 	 * end-user-doc -->

@@ -350,10 +398,12 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionalDevice <em>Functional Device</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionalDevice

+	 * <em>Functional Device</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionalDevice

 	 * @generated

@@ -363,11 +413,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation <em>Function Allocation</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation

+	 * <em>Function Allocation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation

 	 * @generated

@@ -377,11 +429,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface <em>Function Client Server Interface</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface

+	 * <em>Function Client Server Interface</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerInterface

 	 * @generated

@@ -391,11 +445,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort <em>Function Client Server Port</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort

+	 * <em>Function Client Server Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionClientServerPort

 	 * @generated

@@ -405,11 +461,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector <em>Function Connector</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector

+	 * <em>Function Connector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionConnector

 	 * @generated

@@ -419,11 +477,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort <em>Function Flow Port</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort

+	 * <em>Function Flow Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionFlowPort

 	 * @generated

@@ -433,11 +493,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort <em>Function Port</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort

+	 * <em>Function Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPort

 	 * @generated

@@ -447,11 +509,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort <em>Function Power Port</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort

+	 * <em>Function Power Port</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPowerPort

 	 * @generated

@@ -466,6 +530,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -475,11 +540,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype <em>Function Prototype</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype

+	 * <em>Function Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype

 	 * @generated

@@ -489,11 +556,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType <em>Function Type</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType

+	 * <em>Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionType

 	 * @generated

@@ -503,11 +572,13 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType <em>Hardware Function Type</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType

+	 * <em>Hardware Function Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.HardwareFunctionType

 	 * @generated

@@ -517,10 +588,12 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager <em>Local Device Manager</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager

+	 * <em>Local Device Manager</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.LocalDeviceManager

 	 * @generated

@@ -535,6 +608,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.Operation

 	 * @generated

@@ -549,6 +623,7 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.PortGroup

 	 * @generated

@@ -562,15 +637,16 @@ public class FunctionmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceFactoryImpl.java
index 7540147eaa9..4d47f1488e4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.util.FunctionmodelingResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class FunctionmodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class FunctionmodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceImpl.java
index 2d69c8f3e77..9c814845278 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.util.FunctionmodelingResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class FunctionmodelingResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public FunctionmodelingResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingSwitch.java
index 8a257e95a2f..e352fc94b0c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

+import org.eclipse.papyrus.eastadl.structure.functionmodeling.*;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AllocateableElement;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation;

 import org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPrototype;

@@ -52,6 +53,7 @@ import org.eclipse.papyrus.sysml.portandflows.FlowPort;
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPackage

  * @generated

  */

@@ -60,6 +62,7 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static FunctionmodelingPackage modelPackage;

@@ -67,10 +70,11 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingSwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = FunctionmodelingPackage.eINSTANCE;

 		}

 	}

@@ -79,6 +83,7 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -92,7 +97,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Allocateable Element</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Allocateable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -107,7 +114,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Allocation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -122,7 +131,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Analysis Function Prototype</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -137,7 +148,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Analysis Function Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -152,7 +165,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Basic Software Function Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -167,7 +182,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Block</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -182,7 +199,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -197,7 +216,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Design Function Prototype</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -212,7 +233,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Design Function Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -227,7 +250,7 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Flow Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -240,7 +263,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Functional Device</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Functional Device</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -255,7 +280,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Allocation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -270,7 +297,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Client Server Interface</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -285,7 +314,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Client Server Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -300,7 +331,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Connector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -315,7 +348,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Flow Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -330,7 +365,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -345,7 +382,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Power Port</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -360,7 +399,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -375,7 +416,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Prototype</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -390,7 +433,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Function Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -405,7 +450,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Hardware Function Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -418,7 +465,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Local Device Manager</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Local Device Manager</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -433,7 +482,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Operation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -448,7 +499,9 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Port Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -463,7 +516,7 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -476,191 +529,287 @@ public class FunctionmodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case FunctionmodelingPackage.LOCAL_DEVICE_MANAGER: {

-				LocalDeviceManager localDeviceManager = (LocalDeviceManager)theEObject;

-				T result = caseLocalDeviceManager(localDeviceManager);

-				if (result == null) result = caseDesignFunctionType(localDeviceManager);

-				if (result == null) result = caseFunctionType(localDeviceManager);

-				if (result == null) result = caseContext(localDeviceManager);

-				if (result == null) result = caseBlock(localDeviceManager);

-				if (result == null) result = caseEAElement(localDeviceManager);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE: {

-				DesignFunctionType designFunctionType = (DesignFunctionType)theEObject;

-				T result = caseDesignFunctionType(designFunctionType);

-				if (result == null) result = caseFunctionType(designFunctionType);

-				if (result == null) result = caseContext(designFunctionType);

-				if (result == null) result = caseBlock(designFunctionType);

-				if (result == null) result = caseEAElement(designFunctionType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_TYPE: {

-				FunctionType functionType = (FunctionType)theEObject;

-				T result = caseFunctionType(functionType);

-				if (result == null) result = caseContext(functionType);

-				if (result == null) result = caseBlock(functionType);

-				if (result == null) result = caseEAElement(functionType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_PORT: {

-				FunctionPort functionPort = (FunctionPort)theEObject;

-				T result = caseFunctionPort(functionPort);

-				if (result == null) result = caseEAElement(functionPort);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.PORT_GROUP: {

-				PortGroup portGroup = (PortGroup)theEObject;

-				T result = casePortGroup(portGroup);

-				if (result == null) result = caseEAElement(portGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_CONNECTOR: {

-				FunctionConnector functionConnector = (FunctionConnector)theEObject;

-				T result = caseFunctionConnector(functionConnector);

-				if (result == null) result = caseEAElement(functionConnector);

-				if (result == null) result = caseAllocateableElement(functionConnector);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.ALLOCATEABLE_ELEMENT: {

-				AllocateableElement allocateableElement = (AllocateableElement)theEObject;

-				T result = caseAllocateableElement(allocateableElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_PROTOTYPE: {

-				FunctionPrototype functionPrototype = (FunctionPrototype)theEObject;

-				T result = caseFunctionPrototype(functionPrototype);

-				if (result == null) result = caseEAElement(functionPrototype);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE: {

-				DesignFunctionPrototype designFunctionPrototype = (DesignFunctionPrototype)theEObject;

-				T result = caseDesignFunctionPrototype(designFunctionPrototype);

-				if (result == null) result = caseFunctionPrototype(designFunctionPrototype);

-				if (result == null) result = caseAllocateableElement(designFunctionPrototype);

-				if (result == null) result = caseEAElement(designFunctionPrototype);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTIONAL_DEVICE: {

-				FunctionalDevice functionalDevice = (FunctionalDevice)theEObject;

-				T result = caseFunctionalDevice(functionalDevice);

-				if (result == null) result = caseAnalysisFunctionType(functionalDevice);

-				if (result == null) result = caseFunctionType(functionalDevice);

-				if (result == null) result = caseContext(functionalDevice);

-				if (result == null) result = caseBlock(functionalDevice);

-				if (result == null) result = caseEAElement(functionalDevice);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE: {

-				AnalysisFunctionType analysisFunctionType = (AnalysisFunctionType)theEObject;

-				T result = caseAnalysisFunctionType(analysisFunctionType);

-				if (result == null) result = caseFunctionType(analysisFunctionType);

-				if (result == null) result = caseContext(analysisFunctionType);

-				if (result == null) result = caseBlock(analysisFunctionType);

-				if (result == null) result = caseEAElement(analysisFunctionType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE: {

-				AnalysisFunctionPrototype analysisFunctionPrototype = (AnalysisFunctionPrototype)theEObject;

-				T result = caseAnalysisFunctionPrototype(analysisFunctionPrototype);

-				if (result == null) result = caseFunctionPrototype(analysisFunctionPrototype);

-				if (result == null) result = caseEAElement(analysisFunctionPrototype);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_FLOW_PORT: {

-				FunctionFlowPort functionFlowPort = (FunctionFlowPort)theEObject;

-				T result = caseFunctionFlowPort(functionFlowPort);

-				if (result == null) result = caseFlowPort(functionFlowPort);

-				if (result == null) result = caseFunctionPort(functionFlowPort);

-				if (result == null) result = caseEAElement(functionFlowPort);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT: {

-				FunctionClientServerPort functionClientServerPort = (FunctionClientServerPort)theEObject;

-				T result = caseFunctionClientServerPort(functionClientServerPort);

-				if (result == null) result = caseFunctionPort(functionClientServerPort);

-				if (result == null) result = caseEAElement(functionClientServerPort);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE: {

-				FunctionClientServerInterface functionClientServerInterface = (FunctionClientServerInterface)theEObject;

-				T result = caseFunctionClientServerInterface(functionClientServerInterface);

-				if (result == null) result = caseEAElement(functionClientServerInterface);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.OPERATION: {

-				Operation operation = (Operation)theEObject;

-				T result = caseOperation(operation);

-				if (result == null) result = caseEAElement(operation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.BASIC_SOFTWARE_FUNCTION_TYPE: {

-				BasicSoftwareFunctionType basicSoftwareFunctionType = (BasicSoftwareFunctionType)theEObject;

-				T result = caseBasicSoftwareFunctionType(basicSoftwareFunctionType);

-				if (result == null) result = caseDesignFunctionType(basicSoftwareFunctionType);

-				if (result == null) result = caseFunctionType(basicSoftwareFunctionType);

-				if (result == null) result = caseContext(basicSoftwareFunctionType);

-				if (result == null) result = caseBlock(basicSoftwareFunctionType);

-				if (result == null) result = caseEAElement(basicSoftwareFunctionType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE: {

-				HardwareFunctionType hardwareFunctionType = (HardwareFunctionType)theEObject;

-				T result = caseHardwareFunctionType(hardwareFunctionType);

-				if (result == null) result = caseDesignFunctionType(hardwareFunctionType);

-				if (result == null) result = caseFunctionType(hardwareFunctionType);

-				if (result == null) result = caseContext(hardwareFunctionType);

-				if (result == null) result = caseBlock(hardwareFunctionType);

-				if (result == null) result = caseEAElement(hardwareFunctionType);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_ALLOCATION: {

-				FunctionAllocation functionAllocation = (FunctionAllocation)theEObject;

-				T result = caseFunctionAllocation(functionAllocation);

-				if (result == null) result = caseEAElement(functionAllocation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.ALLOCATION: {

-				Allocation allocation = (Allocation)theEObject;

-				T result = caseAllocation(allocation);

-				if (result == null) result = caseEAElement(allocation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case FunctionmodelingPackage.FUNCTION_POWER_PORT: {

-				FunctionPowerPort functionPowerPort = (FunctionPowerPort)theEObject;

-				T result = caseFunctionPowerPort(functionPowerPort);

-				if (result == null) result = caseFunctionPort(functionPowerPort);

-				if (result == null) result = caseEAElement(functionPowerPort);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case FunctionmodelingPackage.LOCAL_DEVICE_MANAGER:

+		{

+			LocalDeviceManager localDeviceManager = (LocalDeviceManager)theEObject;

+			T result = caseLocalDeviceManager(localDeviceManager);

+			if(result == null)

+				result = caseDesignFunctionType(localDeviceManager);

+			if(result == null)

+				result = caseFunctionType(localDeviceManager);

+			if(result == null)

+				result = caseContext(localDeviceManager);

+			if(result == null)

+				result = caseBlock(localDeviceManager);

+			if(result == null)

+				result = caseEAElement(localDeviceManager);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.DESIGN_FUNCTION_TYPE:

+		{

+			DesignFunctionType designFunctionType = (DesignFunctionType)theEObject;

+			T result = caseDesignFunctionType(designFunctionType);

+			if(result == null)

+				result = caseFunctionType(designFunctionType);

+			if(result == null)

+				result = caseContext(designFunctionType);

+			if(result == null)

+				result = caseBlock(designFunctionType);

+			if(result == null)

+				result = caseEAElement(designFunctionType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_TYPE:

+		{

+			FunctionType functionType = (FunctionType)theEObject;

+			T result = caseFunctionType(functionType);

+			if(result == null)

+				result = caseContext(functionType);

+			if(result == null)

+				result = caseBlock(functionType);

+			if(result == null)

+				result = caseEAElement(functionType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_PORT:

+		{

+			FunctionPort functionPort = (FunctionPort)theEObject;

+			T result = caseFunctionPort(functionPort);

+			if(result == null)

+				result = caseEAElement(functionPort);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.PORT_GROUP:

+		{

+			PortGroup portGroup = (PortGroup)theEObject;

+			T result = casePortGroup(portGroup);

+			if(result == null)

+				result = caseEAElement(portGroup);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_CONNECTOR:

+		{

+			FunctionConnector functionConnector = (FunctionConnector)theEObject;

+			T result = caseFunctionConnector(functionConnector);

+			if(result == null)

+				result = caseEAElement(functionConnector);

+			if(result == null)

+				result = caseAllocateableElement(functionConnector);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.ALLOCATEABLE_ELEMENT:

+		{

+			AllocateableElement allocateableElement = (AllocateableElement)theEObject;

+			T result = caseAllocateableElement(allocateableElement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_PROTOTYPE:

+		{

+			FunctionPrototype functionPrototype = (FunctionPrototype)theEObject;

+			T result = caseFunctionPrototype(functionPrototype);

+			if(result == null)

+				result = caseEAElement(functionPrototype);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.DESIGN_FUNCTION_PROTOTYPE:

+		{

+			DesignFunctionPrototype designFunctionPrototype = (DesignFunctionPrototype)theEObject;

+			T result = caseDesignFunctionPrototype(designFunctionPrototype);

+			if(result == null)

+				result = caseFunctionPrototype(designFunctionPrototype);

+			if(result == null)

+				result = caseAllocateableElement(designFunctionPrototype);

+			if(result == null)

+				result = caseEAElement(designFunctionPrototype);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTIONAL_DEVICE:

+		{

+			FunctionalDevice functionalDevice = (FunctionalDevice)theEObject;

+			T result = caseFunctionalDevice(functionalDevice);

+			if(result == null)

+				result = caseAnalysisFunctionType(functionalDevice);

+			if(result == null)

+				result = caseFunctionType(functionalDevice);

+			if(result == null)

+				result = caseContext(functionalDevice);

+			if(result == null)

+				result = caseBlock(functionalDevice);

+			if(result == null)

+				result = caseEAElement(functionalDevice);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_TYPE:

+		{

+			AnalysisFunctionType analysisFunctionType = (AnalysisFunctionType)theEObject;

+			T result = caseAnalysisFunctionType(analysisFunctionType);

+			if(result == null)

+				result = caseFunctionType(analysisFunctionType);

+			if(result == null)

+				result = caseContext(analysisFunctionType);

+			if(result == null)

+				result = caseBlock(analysisFunctionType);

+			if(result == null)

+				result = caseEAElement(analysisFunctionType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.ANALYSIS_FUNCTION_PROTOTYPE:

+		{

+			AnalysisFunctionPrototype analysisFunctionPrototype = (AnalysisFunctionPrototype)theEObject;

+			T result = caseAnalysisFunctionPrototype(analysisFunctionPrototype);

+			if(result == null)

+				result = caseFunctionPrototype(analysisFunctionPrototype);

+			if(result == null)

+				result = caseEAElement(analysisFunctionPrototype);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_FLOW_PORT:

+		{

+			FunctionFlowPort functionFlowPort = (FunctionFlowPort)theEObject;

+			T result = caseFunctionFlowPort(functionFlowPort);

+			if(result == null)

+				result = caseFlowPort(functionFlowPort);

+			if(result == null)

+				result = caseFunctionPort(functionFlowPort);

+			if(result == null)

+				result = caseEAElement(functionFlowPort);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_PORT:

+		{

+			FunctionClientServerPort functionClientServerPort = (FunctionClientServerPort)theEObject;

+			T result = caseFunctionClientServerPort(functionClientServerPort);

+			if(result == null)

+				result = caseFunctionPort(functionClientServerPort);

+			if(result == null)

+				result = caseEAElement(functionClientServerPort);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_CLIENT_SERVER_INTERFACE:

+		{

+			FunctionClientServerInterface functionClientServerInterface = (FunctionClientServerInterface)theEObject;

+			T result = caseFunctionClientServerInterface(functionClientServerInterface);

+			if(result == null)

+				result = caseEAElement(functionClientServerInterface);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.OPERATION:

+		{

+			Operation operation = (Operation)theEObject;

+			T result = caseOperation(operation);

+			if(result == null)

+				result = caseEAElement(operation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.BASIC_SOFTWARE_FUNCTION_TYPE:

+		{

+			BasicSoftwareFunctionType basicSoftwareFunctionType = (BasicSoftwareFunctionType)theEObject;

+			T result = caseBasicSoftwareFunctionType(basicSoftwareFunctionType);

+			if(result == null)

+				result = caseDesignFunctionType(basicSoftwareFunctionType);

+			if(result == null)

+				result = caseFunctionType(basicSoftwareFunctionType);

+			if(result == null)

+				result = caseContext(basicSoftwareFunctionType);

+			if(result == null)

+				result = caseBlock(basicSoftwareFunctionType);

+			if(result == null)

+				result = caseEAElement(basicSoftwareFunctionType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.HARDWARE_FUNCTION_TYPE:

+		{

+			HardwareFunctionType hardwareFunctionType = (HardwareFunctionType)theEObject;

+			T result = caseHardwareFunctionType(hardwareFunctionType);

+			if(result == null)

+				result = caseDesignFunctionType(hardwareFunctionType);

+			if(result == null)

+				result = caseFunctionType(hardwareFunctionType);

+			if(result == null)

+				result = caseContext(hardwareFunctionType);

+			if(result == null)

+				result = caseBlock(hardwareFunctionType);

+			if(result == null)

+				result = caseEAElement(hardwareFunctionType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_ALLOCATION:

+		{

+			FunctionAllocation functionAllocation = (FunctionAllocation)theEObject;

+			T result = caseFunctionAllocation(functionAllocation);

+			if(result == null)

+				result = caseEAElement(functionAllocation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.ALLOCATION:

+		{

+			Allocation allocation = (Allocation)theEObject;

+			T result = caseAllocation(allocation);

+			if(result == null)

+				result = caseEAElement(allocation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case FunctionmodelingPackage.FUNCTION_POWER_PORT:

+		{

+			FunctionPowerPort functionPowerPort = (FunctionPowerPort)theEObject;

+			T result = caseFunctionPowerPort(functionPowerPort);

+			if(result == null)

+				result = caseFunctionPort(functionPowerPort);

+			if(result == null)

+				result = caseEAElement(functionPowerPort);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingXMLProcessor.java
index bce877380c2..d9d427abb25 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/functionmodeling/util/FunctionmodelingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionmodelingPa
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class FunctionmodelingXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class FunctionmodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FunctionmodelingXMLProcessor() {

@@ -44,11 +46,12 @@ public class FunctionmodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Register for "*" and "xml" file extensions the FunctionmodelingResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new FunctionmodelingResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new FunctionmodelingResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Actuator.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Actuator.java
index c8e8733e44f..2b3c6406f2e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Actuator.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Actuator.java
@@ -20,18 +20,21 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Actuator</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Actuator is the element that represents electrical actuators, such as valves, motors, lamps, brake units, etc. Non-electrical actuators such as the engine, hydraulics, etc. are considered part of the plant model (environment). Plant models are not part of the Hardware Design Architecture. 
+ * The Actuator is the element that represents electrical actuators, such as valves, motors, lamps, brake units, etc. Non-electrical actuators such as
+ * the engine, hydraulics, etc. are considered part of the plant model (environment). Plant models are not part of the Hardware Design Architecture.
  * 
  * Semantics:
- * The Actuator metaclass represents the physical and electrical aspects of actuator hardware. The logical aspect is represented by a HWFunctionType associated to the Actuator.
+ * The Actuator metaclass represents the physical and electrical aspects of actuator hardware. The logical aspect is represented by a HWFunctionType
+ * associated to the Actuator.
  * 
  * Notation:
- * Actuator is shown as a solid-outline rectangle with double vertical borders. The rectangle contains the name, and its ports or port groups on the perimeter.
+ * Actuator is shown as a solid-outline rectangle with double vertical borders. The rectangle contains the name, and its ports or port groups on the
+ * perimeter.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getActuator()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/AllocationTarget.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/AllocationTarget.java
index 93fa545f7f9..b3e9be58a16 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/AllocationTarget.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/AllocationTarget.java
@@ -22,17 +22,18 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Allocation Target</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The AllocationTarget is a superclass for elements to which AllocateableElements can be allocated. 
+ * The AllocationTarget is a superclass for elements to which AllocateableElements can be allocated.
  * 
  * Semantics:
- * An AllocationTarget is a resource element in the Hardware Design Architecture which may host functional behaviors in the Functional Design Architecture.
+ * An AllocationTarget is a resource element in the Hardware Design Architecture which may host functional behaviors in the Functional Design
+ * Architecture.
  * 
  * Extension: abstract, no extension
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getAllocationTarget()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/CommunicationHardwarePin.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/CommunicationHardwarePin.java
index 44906b6c5bc..b9a6a940433 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/CommunicationHardwarePin.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/CommunicationHardwarePin.java
@@ -20,20 +20,20 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Communication Hardware Pin</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * CommunicationHardwarePin represents an electrical connection point that can be used to define how the wire harness is logically defined. 
+ * CommunicationHardwarePin represents an electrical connection point that can be used to define how the wire harness is logically defined.
  * 
  * Semantics:
- * The CommunicationHardwarePin represents the hardware connection point of a communication bus. 
+ * The CommunicationHardwarePin represents the hardware connection point of a communication bus.
  * 
  * Depending on modeling style, one or two pins may be defined for a dual-wire bus.
  * 
  * Notation:
  * CommunicationHardwarePin is shown as a solid square with a C inside. Its name may appear outside the square.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getCommunicationHardwarePin()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentPrototype.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentPrototype.java
index bbe6fa9f1c2..bbc1b45c237 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentPrototype.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentPrototype.java
@@ -22,35 +22,39 @@ import org.eclipse.uml2.uml.Property;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Component Prototype</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Appear as parts of a HardwareComponentType and is itself typed by a HardwareComponentType. This allows for a reference to the occurrence of a HardwareComponentType when it acts as a part. The purpose is to support the definition of hierarchical structures, and to reuse the same type of Hardware at several places. For example, a wheel speed sensor may occur at all four wheels, but it has a single definition. 
+ * Appear as parts of a HardwareComponentType and is itself typed by a HardwareComponentType. This allows for a reference to the occurrence of a
+ * HardwareComponentType when it acts as a part. The purpose is to support the definition of hierarchical structures, and to reuse the same type of
+ * Hardware at several places. For example, a wheel speed sensor may occur at all four wheels, but it has a single definition.
  * 
  * Semantics:
- * The HardwareComponentPrototype represents an occurrence of a hardware element, according to the type of the HardwareComponentPrototype. 
+ * The HardwareComponentPrototype represents an occurrence of a hardware element, according to the type of the HardwareComponentPrototype.
  * 
  * Notation:
  * Shall be shown in the same style as the class specified as type, however it shall be clear that this is a part.
  * 
  * Extension: Property
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentPrototype()
  * @model
  * @generated
  */
 public interface HardwareComponentPrototype extends AllocationTarget {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @model kind="operation" required="true" ordered="false"
 	 * @generated
 	 */
@@ -64,6 +68,7 @@ public interface HardwareComponentPrototype extends AllocationTarget {
 	 * The type of the HWElement.
 	 * {derived from UML::TypedElement::type}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentPrototype_Type()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -75,10 +80,10 @@ public interface HardwareComponentPrototype extends AllocationTarget {
 	 * Returns the value of the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Property</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Property</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Property</em>' reference.
 	 * @see #setBase_Property(Property)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentPrototype_Base_Property()
@@ -88,10 +93,13 @@ public interface HardwareComponentPrototype extends AllocationTarget {
 	Property getBase_Property();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property <em>Base Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property
+	 * <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Property</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Property</em>' reference.
 	 * @see #getBase_Property()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentType.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentType.java
index e7c4c919b76..492c911bd49 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentType.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareComponentType.java
@@ -23,44 +23,47 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Component Type</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The HardwareComponentType represents hardware element on an abstract level, allowing preliminary engineering activities related to hardware.
  * 
  * Semantics:
- * The HardwareElementType is a structural entity that defines a part of an electrical architecture. Through its ports it can be connected to electrical sources and sinks. Its logical behavior, the transfer function, may be defined in an HWFunctionType referencing the HardwareElementType. This is typically connected through its ports to the environment model to participate in the end-to-end behavioral definition of a function. 
+ * The HardwareElementType is a structural entity that defines a part of an electrical architecture. Through its ports it can be connected to
+ * electrical sources and sinks. Its logical behavior, the transfer function, may be defined in an HWFunctionType referencing the HardwareElementType.
+ * This is typically connected through its ports to the environment model to participate in the end-to-end behavioral definition of a function.
  * 
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getConnector <em>Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPart <em>Part</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBus <em>Bus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getConnector <em>Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBus <em>Bus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPortGroup <em>Port Group</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType()
  * @model
  * @generated
  */
 public interface HardwareComponentType extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Bus</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Bus</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Bus</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Bus</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_Bus()
 	 * @model ordered="false"
@@ -77,6 +80,7 @@ public interface HardwareComponentType extends Context {
 	 * The HWConnectors.
 	 * {derived from UML::StructuredClassifier::ownedConnector}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Connector</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_Connector()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -93,6 +97,7 @@ public interface HardwareComponentType extends Context {
 	 * The HWElementPrototypes.
 	 * {derived from UML::Classifier::attribute}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Part</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_Part()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -104,10 +109,10 @@ public interface HardwareComponentType extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_Base_Class()
@@ -117,10 +122,13 @@ public interface HardwareComponentType extends Context {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -135,6 +143,7 @@ public interface HardwareComponentType extends Context {
 	 * The Ports.
 	 * {derived from UML::EncapsulatedClassifier::ownedPort}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_Port()
 	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -147,10 +156,10 @@ public interface HardwareComponentType extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareComponentType_PortGroup()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareConnector.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareConnector.java
index 31d97484ea0..a92a311ca8b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareConnector.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwareConnector.java
@@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.Connector;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Connector</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Hardware connectors represent wires that electrically connect the hardware components through its ports.
  * 
@@ -34,30 +34,31 @@ import org.eclipse.uml2.uml.Connector;
  * Extension:
  * Connector
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareConnector()
  * @model
  * @generated
  */
 public interface HardwareConnector extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Connector</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Connector</em>' reference.
 	 * @see #setBase_Connector(Connector)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareConnector_Base_Connector()
@@ -67,10 +68,13 @@ public interface HardwareConnector extends EAElement {
 	Connector getBase_Connector();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector <em>Base Connector</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector
+	 * <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Connector</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Connector</em>' reference.
 	 * @see #getBase_Connector()
 	 * @generated
 	 */
@@ -81,6 +85,7 @@ public interface HardwareConnector extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareConnector_Port()
 	 * @model lower="2" upper="2" transient="true" volatile="true" derived="true" ordered="false"
@@ -93,10 +98,10 @@ public interface HardwareConnector extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port1 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port1 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareConnector_Port1_path()
 	 * @model
@@ -109,10 +114,10 @@ public interface HardwareConnector extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port2 path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port2 path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwareConnector_Port2_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePin.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePin.java
index 041a0822f29..466b2af03d2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePin.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePin.java
@@ -25,9 +25,10 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Pin</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * HardwarePin represents electrical connection points in the hardware architecture. Depending on modeling style, the actual wire or a logical connection can be considered.
+ * HardwarePin represents electrical connection points in the hardware architecture. Depending on modeling style, the actual wire or a logical
+ * connection can be considered.
  * 
  * Semantics
  * Hardware pin represents an electrical connection point.
@@ -35,32 +36,33 @@ import org.eclipse.uml2.uml.Port;
  * Extension:
  * Port
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround <em>Is Ground</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage <em>Voltage</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection <em>Direction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance <em>Impedance</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getPower <em>Power</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround <em>Is Ground</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage <em>Voltage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection <em>Direction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance <em>Impedance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getPower <em>Power</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin()
  * @model abstract="true"
  * @generated
  */
 public interface HardwarePin extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin_Base_Port()
@@ -73,7 +75,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
@@ -87,6 +91,7 @@ public interface HardwarePin extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The direction of current through the pin.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Direction</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind
 	 * @see #setDirection(EADirectionKind)
@@ -100,7 +105,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection <em>Direction</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Direction</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Direction</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.functionmodeling.EADirectionKind
 	 * @see #getDirection()
 	 * @generated
@@ -114,6 +121,7 @@ public interface HardwarePin extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The internal impedance in Ohms to ground of the component as seen through this pin.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Impedance</em>' attribute.
 	 * @see #setImpedance(Float)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin_Impedance()
@@ -129,6 +137,7 @@ public interface HardwarePin extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The maximal power in watts that can be provided by this pin or that is consumed.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Power</em>' attribute.
 	 * @see #setPower(Float)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin_Power()
@@ -141,13 +150,13 @@ public interface HardwarePin extends EAElement {
 	 * Returns the value of the '<em><b>Voltage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Voltage</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Voltage</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * The maximal voltage in Volts provided by the pin. Shall not be defined if isGround=TRUE.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Voltage</em>' attribute.
 	 * @see #setVoltage(Float)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin_Voltage()
@@ -163,6 +172,7 @@ public interface HardwarePin extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Indicates that the pin is connected to ground.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Is Ground</em>' attribute.
 	 * @see #setIsGround(boolean)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePin_IsGround()
@@ -175,7 +185,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance <em>Impedance</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Impedance</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Impedance</em>' attribute.
 	 * @see #getImpedance()
 	 * @generated
 	 */
@@ -185,7 +197,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround <em>Is Ground</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Ground</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Ground</em>' attribute.
 	 * @see #isIsGround()
 	 * @generated
 	 */
@@ -195,7 +209,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getPower <em>Power</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Power</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Power</em>' attribute.
 	 * @see #getPower()
 	 * @generated
 	 */
@@ -205,7 +221,9 @@ public interface HardwarePin extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage <em>Voltage</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Voltage</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Voltage</em>' attribute.
 	 * @see #getVoltage()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinDirectionKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinDirectionKind.java
index 1eece043c51..35a474dd081 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinDirectionKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinDirectionKind.java
@@ -32,9 +32,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * Semantics:
  * The HardwarePinDirectionKind is an enumeration with the three literals "in", "out", and "inout".
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinDirectionKind()
  * @model
  * @generated
@@ -44,6 +45,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>In</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IN_VALUE
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>Inout</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INOUT_VALUE
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OUT_VALUE
 	 * @generated
 	 * @ordered
@@ -74,10 +78,10 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>In</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>In</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IN
 	 * @model name="in"
 	 * @generated
@@ -89,10 +93,10 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>Inout</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INOUT
 	 * @model name="inout"
 	 * @generated
@@ -104,10 +108,10 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * The '<em><b>Out</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Out</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OUT
 	 * @model name="out"
 	 * @generated
@@ -119,19 +123,16 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * An array of all the '<em><b>Hardware Pin Direction Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final HardwarePinDirectionKind[] VALUES_ARRAY =
-		new HardwarePinDirectionKind[] {
-			IN,
-			INOUT,
-			OUT,
-		};
+	private static final HardwarePinDirectionKind[] VALUES_ARRAY = new HardwarePinDirectionKind[]{ IN, INOUT, OUT, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Hardware Pin Direction Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<HardwarePinDirectionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -140,13 +141,17 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * Returns the '<em><b>Hardware Pin Direction Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HardwarePinDirectionKind get(int value) {
-		switch (value) {
-			case IN_VALUE: return IN;
-			case INOUT_VALUE: return INOUT;
-			case OUT_VALUE: return OUT;
+		switch(value) {
+		case IN_VALUE:
+			return IN;
+		case INOUT_VALUE:
+			return INOUT;
+		case OUT_VALUE:
+			return OUT;
 		}
 		return null;
 	}
@@ -155,12 +160,13 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * Returns the '<em><b>Hardware Pin Direction Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HardwarePinDirectionKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			HardwarePinDirectionKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -171,12 +177,13 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * Returns the '<em><b>Hardware Pin Direction Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HardwarePinDirectionKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			HardwarePinDirectionKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -186,6 +193,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -193,6 +201,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -200,6 +209,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -208,6 +218,7 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private HardwarePinDirectionKind(int value, String name, String literal) {
@@ -219,39 +230,43 @@ public enum HardwarePinDirectionKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //HardwarePinDirectionKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinGroup.java
index 0e6ae3c952c..341eec85092 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwarePinGroup.java
@@ -24,9 +24,10 @@ import org.eclipse.uml2.uml.Port;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Hardware Pin Group</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The HardwarePinGroup provides means to organize hardware pins to improve readability of the component interface and connectors between components. Tools may show the set of ports in the pin group as a single pin, join connectors that go between pins in pin groups to a single line. 
+ * The HardwarePinGroup provides means to organize hardware pins to improve readability of the component interface and connectors between components.
+ * Tools may show the set of ports in the pin group as a single pin, join connectors that go between pins in pin groups to a single line.
  * 
  * Semantics:
  * A HardwarePinGroup has no semantics, but is only a grouping mechanism that may affect visualization and port operations in tools.
@@ -34,30 +35,31 @@ import org.eclipse.uml2.uml.Port;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPortGroup <em>Port Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinGroup()
  * @model
  * @generated
  */
 public interface HardwarePinGroup extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Port</em>' reference.
 	 * @see #setBase_Port(Port)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinGroup_Base_Port()
@@ -67,10 +69,13 @@ public interface HardwarePinGroup extends EAElement {
 	Port getBase_Port();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port <em>Base Port</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port <em>Base Port</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Port</em>' reference.
 	 * @see #getBase_Port()
 	 * @generated
 	 */
@@ -80,10 +85,10 @@ public interface HardwarePinGroup extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinGroup_Base_Class()
@@ -93,10 +98,13 @@ public interface HardwarePinGroup extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -107,10 +115,10 @@ public interface HardwarePinGroup extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinGroup_Port()
 	 * @model ordered="false"
@@ -123,10 +131,10 @@ public interface HardwarePinGroup extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port Group</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getHardwarePinGroup_PortGroup()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingFactory.java
index 6b1b78dca45..a2a401ea3ff 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage
  * @generated
  */
 public interface HardwaremodelingFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	HardwaremodelingFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Actuator</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Actuator</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Communication Hardware Pin</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Communication Hardware Pin</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Hardware Component Prototype</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hardware Component Prototype</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>IO Hardware Pin</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>IO Hardware Pin</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Hardware Component Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hardware Component Type</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Hardware Connector</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hardware Connector</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Hardware Pin Group</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hardware Pin Group</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Logical Bus</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Logical Bus</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Node</em>'.
 	 * @generated
 	 */
@@ -119,6 +131,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Power Hardware Pin</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Power Hardware Pin</em>'.
 	 * @generated
 	 */
@@ -128,6 +141,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Power Supply</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Power Supply</em>'.
 	 * @generated
 	 */
@@ -137,6 +151,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Sensor</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Sensor</em>'.
 	 * @generated
 	 */
@@ -146,6 +161,7 @@ public interface HardwaremodelingFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingPackage.java
index 1e30cb8e312..e88a5a0354b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/HardwaremodelingPackage.java
@@ -28,41 +28,52 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The package HardwareModeling contains the elements to model physical entities of the embedded EE system. These elements allow capturing the hardware in sufficient detail to allow preliminary allocation decisions. 
+ * The package HardwareModeling contains the elements to model physical entities of the embedded EE system. These elements allow capturing the
+ * hardware in sufficient detail to allow preliminary allocation decisions.
  * 
- * The allocation decisions are based on requirements on timing, storage, data throughput, processing power, etc. that are defined in the Functional Analysis Architecture and the Functional Design Architecture.
+ * The allocation decisions are based on requirements on timing, storage, data throughput, processing power, etc. that are defined in the Functional
+ * Analysis Architecture and the Functional Design Architecture.
  * 
- * Conversely, the Functional Analysis Architecture and the Functional Design Architecture may be revised based on analysis using information from the Hardware Design Architecture. An example is control law design, where algorithms may be modified for expected computational and communication delays. Thus, the Hardware Design Architecture contains information about properties in order to support, e.g., timing analysis and performance in these respects.
+ * Conversely, the Functional Analysis Architecture and the Functional Design Architecture may be revised based on analysis using information from the
+ * Hardware Design Architecture. An example is control law design, where algorithms may be modified for expected computational and communication
+ * delays. Thus, the Hardware Design Architecture contains information about properties in order to support, e.g., timing analysis and performance in
+ * these respects.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingFactory
  * @model kind="package"
  * @generated
  */
 public interface HardwaremodelingPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl <em>Hardware Component Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl
+		 * <em>Hardware Component Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareComponentType()
 		 * @generated
@@ -73,6 +84,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Connector</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__CONNECTOR = eINSTANCE.getHardwareComponentType_Connector();
@@ -81,6 +93,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__PORT = eINSTANCE.getHardwareComponentType_Port();
@@ -89,6 +102,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__BASE_CLASS = eINSTANCE.getHardwareComponentType_Base_Class();
@@ -97,6 +111,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Part</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__PART = eINSTANCE.getHardwareComponentType_Part();
@@ -105,6 +120,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Bus</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__BUS = eINSTANCE.getHardwareComponentType_Bus();
@@ -113,14 +129,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port Group</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_TYPE__PORT_GROUP = eINSTANCE.getHardwareComponentType_PortGroup();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind <em>IO Hardware Pin Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
+		 * <em>IO Hardware Pin Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getIOHardwarePinKind()
 		 * @generated
@@ -128,9 +147,11 @@ public interface HardwaremodelingPackage extends EPackage {
 		EEnum IO_HARDWARE_PIN_KIND = eINSTANCE.getIOHardwarePinKind();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind <em>Logical Bus Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind <em>Logical Bus Kind</em>}'
+		 * enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getLogicalBusKind()
 		 * @generated
@@ -138,9 +159,11 @@ public interface HardwaremodelingPackage extends EPackage {
 		EEnum LOGICAL_BUS_KIND = eINSTANCE.getLogicalBusKind();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl <em>Hardware Connector</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl
+		 * <em>Hardware Connector</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareConnector()
 		 * @generated
@@ -151,6 +174,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getHardwareConnector_Base_Connector();
@@ -159,6 +183,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_CONNECTOR__PORT = eINSTANCE.getHardwareConnector_Port();
@@ -167,6 +192,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port1 path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_CONNECTOR__PORT1_PATH = eINSTANCE.getHardwareConnector_Port1_path();
@@ -175,14 +201,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port2 path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_CONNECTOR__PORT2_PATH = eINSTANCE.getHardwareConnector_Port2_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl <em>Hardware Pin</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl <em>Hardware Pin</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwarePin()
 		 * @generated
@@ -193,6 +222,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_PIN__BASE_PORT = eINSTANCE.getHardwarePin_Base_Port();
@@ -201,6 +231,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Ground</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HARDWARE_PIN__IS_GROUND = eINSTANCE.getHardwarePin_IsGround();
@@ -209,6 +240,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Voltage</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HARDWARE_PIN__VOLTAGE = eINSTANCE.getHardwarePin_Voltage();
@@ -217,6 +249,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HARDWARE_PIN__DIRECTION = eINSTANCE.getHardwarePin_Direction();
@@ -225,6 +258,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Impedance</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HARDWARE_PIN__IMPEDANCE = eINSTANCE.getHardwarePin_Impedance();
@@ -233,14 +267,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Power</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HARDWARE_PIN__POWER = eINSTANCE.getHardwarePin_Power();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl <em>Hardware Component Prototype</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl
+		 * <em>Hardware Component Prototype</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareComponentPrototype()
 		 * @generated
@@ -251,6 +288,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_PROTOTYPE__TYPE = eINSTANCE.getHardwareComponentPrototype_Type();
@@ -259,14 +297,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY = eINSTANCE.getHardwareComponentPrototype_Base_Property();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl <em>Allocation Target</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl
+		 * <em>Allocation Target</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getAllocationTarget()
 		 * @generated
@@ -274,9 +315,11 @@ public interface HardwaremodelingPackage extends EPackage {
 		EClass ALLOCATION_TARGET = eINSTANCE.getAllocationTarget();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl <em>Logical Bus</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl <em>Logical Bus</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getLogicalBus()
 		 * @generated
@@ -287,6 +330,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LOGICAL_BUS__BASE_CLASS = eINSTANCE.getLogicalBus_Base_Class();
@@ -295,6 +339,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Bus Speed</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LOGICAL_BUS__BUS_SPEED = eINSTANCE.getLogicalBus_BusSpeed();
@@ -303,6 +348,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Bus Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LOGICAL_BUS__BUS_TYPE = eINSTANCE.getLogicalBus_BusType();
@@ -311,6 +357,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Wire</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LOGICAL_BUS__WIRE = eINSTANCE.getLogicalBus_Wire();
@@ -319,14 +366,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Wire path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LOGICAL_BUS__WIRE_PATH = eINSTANCE.getLogicalBus_Wire_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl <em>Hardware Pin Group</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl
+		 * <em>Hardware Pin Group</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwarePinGroup()
 		 * @generated
@@ -337,6 +387,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_PIN_GROUP__BASE_PORT = eINSTANCE.getHardwarePinGroup_Base_Port();
@@ -345,6 +396,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_PIN_GROUP__BASE_CLASS = eINSTANCE.getHardwarePinGroup_Base_Class();
@@ -353,6 +405,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port Group</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_PIN_GROUP__PORT_GROUP = eINSTANCE.getHardwarePinGroup_PortGroup();
@@ -361,14 +414,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HARDWARE_PIN_GROUP__PORT = eINSTANCE.getHardwarePinGroup_Port();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl <em>Power Hardware Pin</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl
+		 * <em>Power Hardware Pin</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getPowerHardwarePin()
 		 * @generated
@@ -376,9 +432,11 @@ public interface HardwaremodelingPackage extends EPackage {
 		EClass POWER_HARDWARE_PIN = eINSTANCE.getPowerHardwarePin();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl <em>IO Hardware Pin</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl
+		 * <em>IO Hardware Pin</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getIOHardwarePin()
 		 * @generated
@@ -389,14 +447,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IO_HARDWARE_PIN__TYPE = eINSTANCE.getIOHardwarePin_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl <em>Communication Hardware Pin</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl
+		 * <em>Communication Hardware Pin</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getCommunicationHardwarePin()
 		 * @generated
@@ -407,6 +468,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl <em>Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getNode()
 		 * @generated
@@ -417,6 +479,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Execution Rate</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NODE__EXECUTION_RATE = eINSTANCE.getNode_ExecutionRate();
@@ -425,6 +488,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Non Volatile Memory</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NODE__NON_VOLATILE_MEMORY = eINSTANCE.getNode_NonVolatileMemory();
@@ -433,14 +497,17 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Volatile Memory</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NODE__VOLATILE_MEMORY = eINSTANCE.getNode_VolatileMemory();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl <em>Power Supply</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl <em>Power Supply</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getPowerSupply()
 		 * @generated
@@ -451,6 +518,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Active</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute POWER_SUPPLY__IS_ACTIVE = eINSTANCE.getPowerSupply_IsActive();
@@ -459,6 +527,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.SensorImpl <em>Sensor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.SensorImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getSensor()
 		 * @generated
@@ -469,6 +538,7 @@ public interface HardwaremodelingPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.ActuatorImpl <em>Actuator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.ActuatorImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getActuator()
 		 * @generated
@@ -481,6 +551,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "hardwaremodeling";
@@ -489,6 +560,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/HardwareModeling/1";
@@ -497,6 +569,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "HardwareModeling";
@@ -505,14 +578,17 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	HardwaremodelingPackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl <em>Hardware Component Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl
+	 * <em>Hardware Component Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareComponentType()
 	 * @generated
@@ -520,9 +596,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	int HARDWARE_COMPONENT_TYPE = 13;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl <em>Hardware Connector</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl
+	 * <em>Hardware Connector</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareConnector()
 	 * @generated
@@ -533,6 +611,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -542,6 +621,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -551,6 +631,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -560,6 +641,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Connector</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -569,6 +651,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -578,6 +661,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port1 path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -587,6 +671,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port2 path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -596,6 +681,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Connector</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -605,6 +691,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl <em>Hardware Pin</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwarePin()
 	 * @generated
@@ -612,9 +699,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	int HARDWARE_PIN = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl <em>Hardware Component Prototype</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl
+	 * <em>Hardware Component Prototype</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwareComponentPrototype()
 	 * @generated
@@ -622,9 +711,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	int HARDWARE_COMPONENT_PROTOTYPE = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl <em>Allocation Target</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl <em>Allocation Target</em>}
+	 * ' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.AllocationTargetImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getAllocationTarget()
 	 * @generated
@@ -635,6 +726,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -644,6 +736,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -653,6 +746,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -662,6 +756,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -671,6 +766,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Ground</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -680,6 +776,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Voltage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -689,6 +786,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Direction</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -698,6 +796,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Impedance</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -707,6 +806,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Power</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -716,15 +816,18 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Pin</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HARDWARE_PIN_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl <em>Power Hardware Pin</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl
+	 * <em>Power Hardware Pin</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerHardwarePinImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getPowerHardwarePin()
 	 * @generated
@@ -732,9 +835,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	int POWER_HARDWARE_PIN = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl <em>IO Hardware Pin</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl <em>IO Hardware Pin</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getIOHardwarePin()
 	 * @generated
@@ -742,9 +847,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	int IO_HARDWARE_PIN = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl <em>Communication Hardware Pin</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl
+	 * <em>Communication Hardware Pin</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.CommunicationHardwarePinImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getCommunicationHardwarePin()
 	 * @generated
@@ -755,6 +862,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl <em>Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getNode()
 	 * @generated
@@ -765,6 +873,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl <em>Power Supply</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getPowerSupply()
 	 * @generated
@@ -775,6 +884,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.SensorImpl <em>Sensor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.SensorImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getSensor()
 	 * @generated
@@ -785,6 +895,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.ActuatorImpl <em>Actuator</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.ActuatorImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getActuator()
 	 * @generated
@@ -795,6 +906,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -804,6 +916,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -813,6 +926,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -822,6 +936,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Allocation Target</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -831,6 +946,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -840,6 +956,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -849,6 +966,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -858,6 +976,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -867,6 +986,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -876,6 +996,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Component Prototype</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -885,6 +1006,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -894,6 +1016,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -903,6 +1026,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -912,6 +1036,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -921,6 +1046,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Ground</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -930,6 +1056,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Voltage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -939,6 +1066,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Direction</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -948,6 +1076,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Impedance</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -957,6 +1086,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Power</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -966,6 +1096,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -975,6 +1106,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>IO Hardware Pin</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -984,6 +1116,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -993,6 +1126,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1002,6 +1136,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1011,6 +1146,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1020,6 +1156,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Ground</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1029,6 +1166,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Voltage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1038,6 +1176,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Direction</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1047,6 +1186,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Impedance</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1056,6 +1196,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Power</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1065,6 +1206,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Power Hardware Pin</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1074,6 +1216,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1083,6 +1226,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1092,6 +1236,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1101,6 +1246,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1110,6 +1256,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Ground</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1119,6 +1266,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Voltage</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1128,6 +1276,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Direction</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1137,6 +1286,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Impedance</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1146,6 +1296,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Power</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1155,6 +1306,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Communication Hardware Pin</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1164,6 +1316,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1173,6 +1326,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1182,6 +1336,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1191,6 +1346,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1200,6 +1356,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1209,6 +1366,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1218,6 +1376,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1227,6 +1386,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1236,6 +1396,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1245,6 +1406,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1254,6 +1416,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1263,6 +1426,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Component Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1272,6 +1436,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1281,6 +1446,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1290,6 +1456,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1299,6 +1466,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1308,6 +1476,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1317,6 +1486,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1326,6 +1496,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1335,6 +1506,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1344,6 +1516,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1353,6 +1526,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1362,6 +1536,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1371,6 +1546,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Execution Rate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1380,6 +1556,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Non Volatile Memory</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1389,6 +1566,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Volatile Memory</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1398,6 +1576,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Node</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1407,6 +1586,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1416,6 +1596,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1425,6 +1606,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1434,6 +1616,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1443,6 +1626,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1452,6 +1636,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1461,6 +1646,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1470,6 +1656,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1479,6 +1666,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1488,6 +1676,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1497,6 +1686,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1506,6 +1696,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1515,6 +1706,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Power Supply</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1524,6 +1716,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1533,6 +1726,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1542,6 +1736,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1551,6 +1746,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1560,6 +1756,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1569,6 +1766,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1578,6 +1776,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1587,6 +1786,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1596,6 +1796,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1605,6 +1806,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1614,6 +1816,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1623,6 +1826,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Sensor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1632,6 +1836,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1641,6 +1846,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1650,6 +1856,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1659,6 +1866,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1668,6 +1876,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1677,6 +1886,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Connector</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1686,6 +1896,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1695,6 +1906,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Part</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1704,6 +1916,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1713,6 +1926,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1722,6 +1936,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1731,6 +1946,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Actuator</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1740,6 +1956,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl <em>Logical Bus</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getLogicalBus()
 	 * @generated
@@ -1750,6 +1967,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1759,6 +1977,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1768,6 +1987,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1777,6 +1997,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1786,6 +2007,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus Speed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1795,6 +2017,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Bus Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1804,6 +2027,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Wire</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1813,6 +2037,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Wire path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1822,15 +2047,18 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Logical Bus</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LOGICAL_BUS_FEATURE_COUNT = ALLOCATION_TARGET_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl <em>Hardware Pin Group</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl
+	 * <em>Hardware Pin Group</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getHardwarePinGroup()
 	 * @generated
@@ -1841,6 +2069,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1850,6 +2079,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1859,6 +2089,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1868,6 +2099,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1877,6 +2109,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1886,6 +2119,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port Group</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1895,6 +2129,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1904,15 +2139,18 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Hardware Pin Group</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HARDWARE_PIN_GROUP_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind <em>IO Hardware Pin Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind <em>IO Hardware Pin Kind</em>}'
+	 * enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getIOHardwarePinKind()
 	 * @generated
@@ -1923,6 +2161,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind <em>Logical Bus Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwaremodelingPackageImpl#getLogicalBusKind()
 	 * @generated
@@ -1933,6 +2172,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator <em>Actuator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Actuator</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator
 	 * @generated
@@ -1943,6 +2183,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget <em>Allocation Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Allocation Target</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget
 	 * @generated
@@ -1953,6 +2194,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin <em>IO Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>IO Hardware Pin</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin
 	 * @generated
@@ -1963,6 +2205,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin#getType()
 	 * @see #getIOHardwarePin()
@@ -1971,9 +2214,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getIOHardwarePin_Type();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin <em>Communication Hardware Pin</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin
+	 * <em>Communication Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Communication Hardware Pin</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin
 	 * @generated
@@ -1981,9 +2226,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getCommunicationHardwarePin();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype <em>Hardware Component Prototype</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype
+	 * <em>Hardware Component Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hardware Component Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype
 	 * @generated
@@ -1991,9 +2238,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getHardwareComponentPrototype();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getType
+	 * <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getType()
 	 * @see #getHardwareComponentPrototype()
@@ -2002,9 +2251,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentPrototype_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property <em>Base Property</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property <em>Base Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Property</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype#getBase_Property()
 	 * @see #getHardwareComponentPrototype()
@@ -2013,9 +2264,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentPrototype_Base_Property();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType <em>Hardware Component Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType
+	 * <em>Hardware Component Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hardware Component Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType
 	 * @generated
@@ -2023,9 +2276,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getHardwareComponentType();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBus <em>Bus</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBus
+	 * <em>Bus</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Bus</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBus()
 	 * @see #getHardwareComponentType()
@@ -2034,9 +2289,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_Bus();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getConnector <em>Connector</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getConnector <em>Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getConnector()
 	 * @see #getHardwareComponentType()
@@ -2045,9 +2302,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_Connector();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPart <em>Part</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPart
+	 * <em>Part</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Part</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPart()
 	 * @see #getHardwareComponentType()
@@ -2056,9 +2315,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_Part();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getBase_Class()
 	 * @see #getHardwareComponentType()
@@ -2067,9 +2328,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPort <em>Port</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPort
+	 * <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPort()
 	 * @see #getHardwareComponentType()
@@ -2078,9 +2341,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPortGroup <em>Port Group</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPortGroup <em>Port Group</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port Group</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType#getPortGroup()
 	 * @see #getHardwareComponentType()
@@ -2089,9 +2354,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareComponentType_PortGroup();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind <em>IO Hardware Pin Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
+	 * <em>IO Hardware Pin Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>IO Hardware Pin Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
 	 * @generated
@@ -2099,9 +2366,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EEnum getIOHardwarePinKind();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector <em>Hardware Connector</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector <em>Hardware Connector</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hardware Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector
 	 * @generated
@@ -2109,9 +2378,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getHardwareConnector();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector <em>Base Connector</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector
+	 * <em>Base Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Connector</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getBase_Connector()
 	 * @see #getHardwareConnector()
@@ -2120,9 +2391,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareConnector_Base_Connector();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort <em>Port</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort
+	 * <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort()
 	 * @see #getHardwareConnector()
@@ -2131,9 +2404,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareConnector_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort1_path <em>Port1 path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort1_path
+	 * <em>Port1 path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port1 path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort1_path()
 	 * @see #getHardwareConnector()
@@ -2142,9 +2417,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwareConnector_Port1_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort2_path <em>Port2 path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort2_path
+	 * <em>Port2 path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port2 path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector#getPort2_path()
 	 * @see #getHardwareConnector()
@@ -2156,6 +2433,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -2165,6 +2443,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin <em>Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hardware Pin</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin
 	 * @generated
@@ -2172,9 +2451,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getHardwarePin();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port <em>Base Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port
+	 * <em>Base Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getBase_Port()
 	 * @see #getHardwarePin()
@@ -2183,9 +2464,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwarePin_Base_Port();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection <em>Direction</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection
+	 * <em>Direction</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Direction</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getDirection()
 	 * @see #getHardwarePin()
@@ -2194,9 +2477,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getHardwarePin_Direction();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance <em>Impedance</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance
+	 * <em>Impedance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Impedance</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getImpedance()
 	 * @see #getHardwarePin()
@@ -2205,9 +2490,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getHardwarePin_Impedance();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround <em>Is Ground</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround
+	 * <em>Is Ground</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Ground</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#isIsGround()
 	 * @see #getHardwarePin()
@@ -2219,6 +2506,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getPower <em>Power</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Power</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getPower()
 	 * @see #getHardwarePin()
@@ -2227,9 +2515,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getHardwarePin_Power();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage <em>Voltage</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage
+	 * <em>Voltage</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Voltage</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin#getVoltage()
 	 * @see #getHardwarePin()
@@ -2238,9 +2528,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getHardwarePin_Voltage();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup <em>Hardware Pin Group</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup <em>Hardware Pin Group</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hardware Pin Group</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup
 	 * @generated
@@ -2248,9 +2540,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getHardwarePinGroup();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port <em>Base Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port
+	 * <em>Base Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Port()
 	 * @see #getHardwarePinGroup()
@@ -2259,9 +2553,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwarePinGroup_Base_Port();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getBase_Class()
 	 * @see #getHardwarePinGroup()
@@ -2270,9 +2566,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwarePinGroup_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPort <em>Port</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPort
+	 * <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPort()
 	 * @see #getHardwarePinGroup()
@@ -2281,9 +2579,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getHardwarePinGroup_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPortGroup <em>Port Group</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPortGroup
+	 * <em>Port Group</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port Group</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup#getPortGroup()
 	 * @see #getHardwarePinGroup()
@@ -2295,6 +2595,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus <em>Logical Bus</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Logical Bus</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus
 	 * @generated
@@ -2302,9 +2603,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getLogicalBus();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class()
 	 * @see #getLogicalBus()
@@ -2313,9 +2616,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getLogicalBus_Base_Class();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed <em>Bus Speed</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed
+	 * <em>Bus Speed</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Bus Speed</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed()
 	 * @see #getLogicalBus()
@@ -2324,9 +2629,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getLogicalBus_BusSpeed();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType <em>Bus Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType
+	 * <em>Bus Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Bus Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType()
 	 * @see #getLogicalBus()
@@ -2335,9 +2642,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getLogicalBus_BusType();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire <em>Wire</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire <em>Wire</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Wire</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire()
 	 * @see #getLogicalBus()
@@ -2346,9 +2655,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EReference getLogicalBus_Wire();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire_path <em>Wire path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire_path
+	 * <em>Wire path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Wire path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire_path()
 	 * @see #getLogicalBus()
@@ -2360,6 +2671,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind <em>Logical Bus Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Logical Bus Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind
 	 * @generated
@@ -2370,6 +2682,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node <em>Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Node</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node
 	 * @generated
@@ -2377,9 +2690,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getNode();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate <em>Execution Rate</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate
+	 * <em>Execution Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Execution Rate</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate()
 	 * @see #getNode()
@@ -2388,9 +2703,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getNode_ExecutionRate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory <em>Non Volatile Memory</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory
+	 * <em>Non Volatile Memory</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Non Volatile Memory</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory()
 	 * @see #getNode()
@@ -2399,9 +2716,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getNode_NonVolatileMemory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory <em>Volatile Memory</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory
+	 * <em>Volatile Memory</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Volatile Memory</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory()
 	 * @see #getNode()
@@ -2410,9 +2729,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EAttribute getNode_VolatileMemory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin <em>Power Hardware Pin</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin <em>Power Hardware Pin</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Power Hardware Pin</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin
 	 * @generated
@@ -2423,6 +2744,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply <em>Power Supply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Power Supply</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply
 	 * @generated
@@ -2430,9 +2752,11 @@ public interface HardwaremodelingPackage extends EPackage {
 	EClass getPowerSupply();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive <em>Is Active</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive
+	 * <em>Is Active</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Active</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive()
 	 * @see #getPowerSupply()
@@ -2444,6 +2768,7 @@ public interface HardwaremodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor <em>Sensor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Sensor</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePin.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePin.java
index 86ae4afc9a9..ab979757d1b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePin.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePin.java
@@ -20,24 +20,24 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>IO Hardware Pin</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * IOHardwarePin represents an electrical connection point for digital or analog I/O. 
+ * IOHardwarePin represents an electrical connection point for digital or analog I/O.
  * 
  * Semantics:
- * The IOHardwarePin represents an electrical pin or connection point. 
+ * The IOHardwarePin represents an electrical pin or connection point.
  * 
  * Notation:
  * IOHardwarePin is shown as a solid square with an IO inside. Its name may appear outside the square.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getIOHardwarePin()
  * @model
  * @generated
@@ -52,6 +52,7 @@ public interface IOHardwarePin extends HardwarePin {
 	 * <!-- begin-model-doc -->
 	 * kind defines whether the IOHardwarePort is digital, analog or PWM (Pulse Width Modulated).
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
 	 * @see #setType(IOHardwarePinKind)
@@ -65,7 +66,9 @@ public interface IOHardwarePin extends HardwarePin {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind
 	 * @see #getType()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePinKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePinKind.java
index 7ba3988aea4..9e4cb2ea682 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePinKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/IOHardwarePinKind.java
@@ -29,9 +29,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->
  * IOHardwarePinKind is an enumeration type representing different kinds of I/O Hardware Ports.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getIOHardwarePinKind()
  * @model
  * @generated
@@ -41,6 +42,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * The '<em><b>Digital</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DIGITAL_VALUE
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * The '<em><b>Analog</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ANALOG_VALUE
 	 * @generated
 	 * @ordered
@@ -61,6 +64,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * The '<em><b>Pwm</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PWM_VALUE
 	 * @generated
 	 * @ordered
@@ -71,6 +75,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * The '<em><b>Other</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER_VALUE
 	 * @generated
 	 * @ordered
@@ -84,6 +89,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * I/O with fixed amplitude.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #DIGITAL
 	 * @model name="digital"
 	 * @generated
@@ -98,6 +104,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * I/O with varying amplitude.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #ANALOG
 	 * @model name="analog"
 	 * @generated
@@ -112,6 +119,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * PWM (Pulse Width Modulated) modulated I/O, i.e. a signal with fixed frequency and amplitude but varying duty cycle.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #PWM
 	 * @model name="pwm"
 	 * @generated
@@ -126,6 +134,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Another type of I/O port.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #OTHER
 	 * @model name="other"
 	 * @generated
@@ -137,20 +146,16 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * An array of all the '<em><b>IO Hardware Pin Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final IOHardwarePinKind[] VALUES_ARRAY =
-		new IOHardwarePinKind[] {
-			DIGITAL,
-			ANALOG,
-			PWM,
-			OTHER,
-		};
+	private static final IOHardwarePinKind[] VALUES_ARRAY = new IOHardwarePinKind[]{ DIGITAL, ANALOG, PWM, OTHER, };
 
 	/**
 	 * A public read-only list of all the '<em><b>IO Hardware Pin Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<IOHardwarePinKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -159,14 +164,19 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * Returns the '<em><b>IO Hardware Pin Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static IOHardwarePinKind get(int value) {
-		switch (value) {
-			case DIGITAL_VALUE: return DIGITAL;
-			case ANALOG_VALUE: return ANALOG;
-			case PWM_VALUE: return PWM;
-			case OTHER_VALUE: return OTHER;
+		switch(value) {
+		case DIGITAL_VALUE:
+			return DIGITAL;
+		case ANALOG_VALUE:
+			return ANALOG;
+		case PWM_VALUE:
+			return PWM;
+		case OTHER_VALUE:
+			return OTHER;
 		}
 		return null;
 	}
@@ -175,12 +185,13 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * Returns the '<em><b>IO Hardware Pin Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static IOHardwarePinKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			IOHardwarePinKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -191,12 +202,13 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * Returns the '<em><b>IO Hardware Pin Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static IOHardwarePinKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			IOHardwarePinKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -206,6 +218,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -213,6 +226,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -220,6 +234,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -228,6 +243,7 @@ public enum IOHardwarePinKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private IOHardwarePinKind(int value, String name, String literal) {
@@ -239,39 +255,43 @@ public enum IOHardwarePinKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //IOHardwarePinKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBus.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBus.java
index 615722b5eb1..9a13c4fc08e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBus.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBus.java
@@ -22,42 +22,46 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Logical Bus</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The LogicalBus represents logical communication channels. It serves as an allocation target for connectors, i.e. the data exchanged between functions in the FunctionalDesignArchitecture. 
+ * The LogicalBus represents logical communication channels. It serves as an allocation target for connectors, i.e. the data exchanged between
+ * functions in the FunctionalDesignArchitecture.
  * 
  * 
  * Semantics:
- * The LogicalBus represents a logical connection that carries data from any sender to all receivers. Senders and receivers are identified by the wires of the LogicalBus, i.e. the associated HardwareConnectors. The available busSpeed represents the maximum amount of useful data that can be carried. The busSpeed has already deducted speed reduction resulting from frame overhead, timing effects, etc. 
+ * The LogicalBus represents a logical connection that carries data from any sender to all receivers. Senders and receivers are identified by the
+ * wires of the LogicalBus, i.e. the associated HardwareConnectors. The available busSpeed represents the maximum amount of useful data that can be
+ * carried. The busSpeed has already deducted speed reduction resulting from frame overhead, timing effects, etc.
  * 
- * Extension: 
+ * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed <em>Bus Speed</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType <em>Bus Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire <em>Wire</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire_path <em>Wire path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed <em>Bus Speed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType <em>Bus Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire <em>Wire</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getWire_path <em>Wire path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBus()
  * @model
  * @generated
  */
 public interface LogicalBus extends AllocationTarget {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBus_Base_Class()
@@ -70,7 +74,9 @@ public interface LogicalBus extends AllocationTarget {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -80,10 +86,10 @@ public interface LogicalBus extends AllocationTarget {
 	 * Returns the value of the '<em><b>Bus Speed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Bus Speed</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Bus Speed</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Bus Speed</em>' attribute.
 	 * @see #setBusSpeed(Float)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBus_BusSpeed()
@@ -97,10 +103,10 @@ public interface LogicalBus extends AllocationTarget {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Bus Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Bus Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Bus Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind
 	 * @see #setBusType(LogicalBusKind)
@@ -115,10 +121,10 @@ public interface LogicalBus extends AllocationTarget {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Wire</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Wire</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Wire</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBus_Wire()
 	 * @model
@@ -131,10 +137,10 @@ public interface LogicalBus extends AllocationTarget {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Wire path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Wire path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Wire path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBus_Wire_path()
 	 * @model
@@ -146,7 +152,9 @@ public interface LogicalBus extends AllocationTarget {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusSpeed <em>Bus Speed</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bus Speed</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bus Speed</em>' attribute.
 	 * @see #getBusSpeed()
 	 * @generated
 	 */
@@ -156,7 +164,9 @@ public interface LogicalBus extends AllocationTarget {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus#getBusType <em>Bus Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bus Type</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bus Type</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind
 	 * @see #getBusType()
 	 * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBusKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBusKind.java
index afc970a6b10..aa78246f3c5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBusKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/LogicalBusKind.java
@@ -29,9 +29,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->
  * LogicalBusKind is an enumeration type representing different kinds of busses.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getLogicalBusKind()
  * @model
  * @generated
@@ -41,6 +42,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * The '<em><b>Time Triggered</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TIME_TRIGGERED_VALUE
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * The '<em><b>Event Triggered</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #EVENT_TRIGGERED_VALUE
 	 * @generated
 	 * @ordered
@@ -61,6 +64,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * The '<em><b>Timeand Event Triggered</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TIMEAND_EVENT_TRIGGERED_VALUE
 	 * @generated
 	 * @ordered
@@ -71,6 +75,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * The '<em><b>Other</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OTHER_VALUE
 	 * @generated
 	 * @ordered
@@ -84,6 +89,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Bus is time-triggered
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #TIME_TRIGGERED
 	 * @model name="TimeTriggered"
 	 * @generated
@@ -98,6 +104,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Bus is event-triggered
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #EVENT_TRIGGERED
 	 * @model name="EventTriggered"
 	 * @generated
@@ -112,6 +119,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Bus is both time and event-triggered
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #TIMEAND_EVENT_TRIGGERED
 	 * @model name="TimeandEventTriggered"
 	 * @generated
@@ -126,6 +134,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * <!-- begin-model-doc -->
 	 * Another type of bus communication
 	 * <!-- end-model-doc -->
+	 * 
 	 * @see #OTHER
 	 * @model name="other"
 	 * @generated
@@ -137,20 +146,16 @@ public enum LogicalBusKind implements Enumerator {
 	 * An array of all the '<em><b>Logical Bus Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final LogicalBusKind[] VALUES_ARRAY =
-		new LogicalBusKind[] {
-			TIME_TRIGGERED,
-			EVENT_TRIGGERED,
-			TIMEAND_EVENT_TRIGGERED,
-			OTHER,
-		};
+	private static final LogicalBusKind[] VALUES_ARRAY = new LogicalBusKind[]{ TIME_TRIGGERED, EVENT_TRIGGERED, TIMEAND_EVENT_TRIGGERED, OTHER, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Logical Bus Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<LogicalBusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -159,14 +164,19 @@ public enum LogicalBusKind implements Enumerator {
 	 * Returns the '<em><b>Logical Bus Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LogicalBusKind get(int value) {
-		switch (value) {
-			case TIME_TRIGGERED_VALUE: return TIME_TRIGGERED;
-			case EVENT_TRIGGERED_VALUE: return EVENT_TRIGGERED;
-			case TIMEAND_EVENT_TRIGGERED_VALUE: return TIMEAND_EVENT_TRIGGERED;
-			case OTHER_VALUE: return OTHER;
+		switch(value) {
+		case TIME_TRIGGERED_VALUE:
+			return TIME_TRIGGERED;
+		case EVENT_TRIGGERED_VALUE:
+			return EVENT_TRIGGERED;
+		case TIMEAND_EVENT_TRIGGERED_VALUE:
+			return TIMEAND_EVENT_TRIGGERED;
+		case OTHER_VALUE:
+			return OTHER;
 		}
 		return null;
 	}
@@ -175,12 +185,13 @@ public enum LogicalBusKind implements Enumerator {
 	 * Returns the '<em><b>Logical Bus Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LogicalBusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LogicalBusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -191,12 +202,13 @@ public enum LogicalBusKind implements Enumerator {
 	 * Returns the '<em><b>Logical Bus Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static LogicalBusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			LogicalBusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -206,6 +218,7 @@ public enum LogicalBusKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -213,6 +226,7 @@ public enum LogicalBusKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -220,6 +234,7 @@ public enum LogicalBusKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -228,6 +243,7 @@ public enum LogicalBusKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private LogicalBusKind(int value, String name, String literal) {
@@ -239,39 +255,43 @@ public enum LogicalBusKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //LogicalBusKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Node.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Node.java
index 523124772f6..7febf4dfbef 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Node.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Node.java
@@ -20,32 +20,38 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Node</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Node represents the computer nodes of the embedded EE system. Nodes consist of processor(s) and may be connected to sensors, actuators and other ECUs via a BusConnector.
+ * Node represents the computer nodes of the embedded EE system. Nodes consist of processor(s) and may be connected to sensors, actuators and other
+ * ECUs via a BusConnector.
  * 
- * Node denotes an electronic control unit that acts as a computing element executing Functions. In case a single CPU-single core ECU is represented, it is sufficient to have a single, non-hierarchical Node. 
+ * Node denotes an electronic control unit that acts as a computing element executing Functions. In case a single CPU-single core ECU is represented,
+ * it is sufficient to have a single, non-hierarchical Node.
  * 
  * Semantics:
  * The Node element represents an ECU, i.e. an Electronic Control Unit and an allocation target of FunctionPrototypes.
  * 
- * The Node executes its allocated FunctionPrototypes at the specified executionRate. The executionRate denotes how many execution seconds of an allocated functionPrototype´s execution time that is processed each real-time second. Actual execution time is thus found by dividing the parameters of the ExecutionTimeConstraint with executionRate.
+ * The Node executes its allocated FunctionPrototypes at the specified executionRate. The executionRate denotes how many execution seconds of an
+ * allocated functionPrototype´s execution time that is processed each real-time second. Actual execution time is thus found by dividing the
+ * parameters of the ExecutionTimeConstraint with executionRate.
  * 
- * Example: If an ECU is 25% faster than a standard ECU (e.g., in a certain context, execution times are given assuming a nominal speed of 100 MHz; Our CPU is then 125 MHz), the executionRate is 1.25. An execution time of 5 ms would then become 4 ms on this ECU.
+ * Example: If an ECU is 25% faster than a standard ECU (e.g., in a certain context, execution times are given assuming a nominal speed of 100 MHz;
+ * Our CPU is then 125 MHz), the executionRate is 1.25. An execution time of 5 ms would then become 4 ms on this ECU.
  * 
  * Notation:
- * Node is shown as a solid-outline rectangle with Node at the top right. The rectangle contains the name, and its ports or port groups on the perimeter.
+ * Node is shown as a solid-outline rectangle with Node at the top right. The rectangle contains the name, and its ports or port groups on the
+ * perimeter.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate <em>Execution Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory <em>Non Volatile Memory</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory <em>Volatile Memory</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate <em>Execution Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory <em>Non Volatile Memory</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory <em>Volatile Memory</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getNode()
  * @model
  * @generated
@@ -58,8 +64,10 @@ public interface Node extends HardwareComponentType {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * ExecutionRate is used to compute an approximate execution time. A nominal execution time divided by executionRate provides the actual execution time to be used e.g. for timing analysis in feasibility studies.
+	 * ExecutionRate is used to compute an approximate execution time. A nominal execution time divided by executionRate provides the actual execution
+	 * time to be used e.g. for timing analysis in feasibility studies.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Execution Rate</em>' attribute.
 	 * @see #setExecutionRate(Float)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getNode_ExecutionRate()
@@ -75,6 +83,7 @@ public interface Node extends HardwareComponentType {
 	 * <!-- begin-model-doc -->
 	 * The size in Bytes of the Node’s Non-Volatile memory (ROM, NRAM, EPROM, etc .
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Non Volatile Memory</em>' attribute.
 	 * @see #setNonVolatileMemory(int)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getNode_NonVolatileMemory()
@@ -90,6 +99,7 @@ public interface Node extends HardwareComponentType {
 	 * <!-- begin-model-doc -->
 	 * The size in Bytes of the Node’s Volatile memory (RAM)
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Volatile Memory</em>' attribute.
 	 * @see #setVolatileMemory(int)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getNode_VolatileMemory()
@@ -102,27 +112,35 @@ public interface Node extends HardwareComponentType {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getExecutionRate <em>Execution Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Execution Rate</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Execution Rate</em>' attribute.
 	 * @see #getExecutionRate()
 	 * @generated
 	 */
 	void setExecutionRate(Float value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory <em>Non Volatile Memory</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getNonVolatileMemory <em>Non Volatile Memory</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Volatile Memory</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Non Volatile Memory</em>' attribute.
 	 * @see #getNonVolatileMemory()
 	 * @generated
 	 */
 	void setNonVolatileMemory(int value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory <em>Volatile Memory</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node#getVolatileMemory <em>Volatile Memory</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Volatile Memory</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Volatile Memory</em>' attribute.
 	 * @see #getVolatileMemory()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerHardwarePin.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerHardwarePin.java
index 7d08b367c79..743aed00453 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerHardwarePin.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerHardwarePin.java
@@ -20,18 +20,19 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Power Hardware Pin</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * PowerHardwarePin represents a pin that is primarily intended for power supply, either providing or consuming energy.
  * 
  * Semantics:
- * A PowerHardwarePin is primarily intended to be a power supply. The direction attribute of the pin defines whether it is providing or consuming energy 
+ * A PowerHardwarePin is primarily intended to be a power supply. The direction attribute of the pin defines whether it is providing or consuming
+ * energy
  * 
  * Notation:
  * PowerHardwarePin is shown as a solid square with PWR inside. Its name may appear outside the square.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getPowerHardwarePin()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerSupply.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerSupply.java
index 6bf554de681..17362b99ab8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerSupply.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/PowerSupply.java
@@ -20,7 +20,7 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Power Supply</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * PowerSupply represents a hardware element that supplies power.
  * 
@@ -28,32 +28,34 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * PowerSupply denotes a power source that may be active (e.g., a battery) or passive (main relay).
  * 
  * Notation:
- * PowerSupply is shown as a solid-outline rectangle with "PWR" at the top right. The rectangle contains the name, and its ports or port groups on the perimeter.
+ * PowerSupply is shown as a solid-outline rectangle with "PWR" at the top right. The rectangle contains the name, and its ports or port groups on the
+ * perimeter.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive <em>Is Active</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive <em>Is Active</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getPowerSupply()
  * @model
  * @generated
  */
 public interface PowerSupply extends HardwareComponentType {
+
 	/**
 	 * Returns the value of the '<em><b>Is Active</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Is Active</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Is Active</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * Indicates if the PowerSupply is active or passive.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Is Active</em>' attribute.
 	 * @see #setIsActive(boolean)
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getPowerSupply_IsActive()
@@ -66,7 +68,9 @@ public interface PowerSupply extends HardwareComponentType {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply#isIsActive <em>Is Active</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Active</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Active</em>' attribute.
 	 * @see #isIsActive()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Sensor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Sensor.java
index 19db3e1a2b2..9c82140f3f9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Sensor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/Sensor.java
@@ -20,18 +20,20 @@ package org.eclipse.papyrus.eastadl.structure.hardwaremodeling;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Sensor</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Sensor represents a hardware entity for digital or analog sensor elements. The Sensor is connected electrically to the electrical entities of the Hardware Design Architecture. 
+ * Sensor represents a hardware entity for digital or analog sensor elements. The Sensor is connected electrically to the electrical entities of the
+ * Hardware Design Architecture.
  * 
  * Semantics:
- * Sensor denotes an electrical sensor. The Sensor represents the physical and electrical aspects of sensor hardware. The logical aspect is represented by an HWFunctionType associated to the Sensor.
+ * Sensor denotes an electrical sensor. The Sensor represents the physical and electrical aspects of sensor hardware. The logical aspect is
+ * represented by an HWFunctionType associated to the Sensor.
  * 
  * Notation:
  * Sensor is shown as a Circle or oval. The circle contains the name, and its ports or port groups on the perimeter.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#getSensor()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/ActuatorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/ActuatorImpl.java
index 8a5665d1921..62165e31931 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/ActuatorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/ActuatorImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ActuatorImpl extends HardwareComponentTypeImpl implements Actuator {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ActuatorImpl() {
@@ -42,6 +44,7 @@ public class ActuatorImpl extends HardwareComponentTypeImpl implements Actuator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/AllocationTargetImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/AllocationTargetImpl.java
index 44578304a36..6b80b473d8d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/AllocationTargetImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/AllocationTargetImpl.java
@@ -27,13 +27,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class AllocationTargetImpl extends EAElementImpl implements AllocationTarget {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AllocationTargetImpl() {
@@ -43,6 +45,7 @@ public abstract class AllocationTargetImpl extends EAElementImpl implements Allo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/CommunicationHardwarePinImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/CommunicationHardwarePinImpl.java
index ad4ec9881bc..5aaafab71cb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/CommunicationHardwarePinImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/CommunicationHardwarePinImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPa
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class CommunicationHardwarePinImpl extends HardwarePinImpl implements CommunicationHardwarePin {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CommunicationHardwarePinImpl() {
@@ -42,6 +44,7 @@ public class CommunicationHardwarePinImpl extends HardwarePinImpl implements Com
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentPrototypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentPrototypeImpl.java
index 01163399fc0..a93ae49eddc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentPrototypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentPrototypeImpl.java
@@ -36,11 +36,11 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentPrototypeImpl#getBase_Property <em>Base Property</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HardwareComponentPrototypeImpl extends AllocationTargetImpl implements HardwareComponentPrototype {
@@ -49,13 +49,16 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 	 * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Property()
 	 * @generated
 	 * @ordered
 	 */
 	protected Property base_Property;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwareComponentPrototypeImpl() {
@@ -74,7 +77,7 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 
 			Type basicType = getBase_Property().getType();
 
-			
+
 			if(basicType != null) {
 				type = (HardwareComponentType)UMLUtil.getStereotypeApplication(basicType, HardwareComponentType.class);
 			}
@@ -86,14 +89,15 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property getBase_Property() {
-		if (base_Property != null && base_Property.eIsProxy()) {
+		if(base_Property != null && base_Property.eIsProxy()) {
 			InternalEObject oldBase_Property = (InternalEObject)base_Property;
 			base_Property = (Property)eResolveProxy(oldBase_Property);
-			if (base_Property != oldBase_Property) {
-				if (eNotificationRequired())
+			if(base_Property != oldBase_Property) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 			}
 		}
@@ -103,6 +107,7 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Property basicGetBase_Property() {
@@ -112,64 +117,71 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Property(Property newBase_Property) {
 		Property oldBase_Property = base_Property;
 		base_Property = newBase_Property;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY, oldBase_Property, base_Property));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
-				if (resolve) return getBase_Property();
-				return basicGetBase_Property();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__TYPE:
+			if(resolve)
+				return getType();
+			return basicGetType();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
+			if(resolve)
+				return getBase_Property();
+			return basicGetBase_Property();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__TYPE:
-				return basicGetType() != null;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
-				return base_Property != null;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__TYPE:
+			return basicGetType() != null;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
+			return base_Property != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	
+
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,14 +191,15 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
-				setBase_Property((Property)null);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE__BASE_PROPERTY:
+			setBase_Property((Property)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -224,6 +237,7 @@ public class HardwareComponentPrototypeImpl extends AllocationTargetImpl impleme
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentType getType() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentTypeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentTypeImpl.java
index 3b12f311fb9..be36c8297e5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentTypeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareComponentTypeImpl.java
@@ -45,15 +45,15 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getConnector <em>Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPart <em>Part</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getBus <em>Bus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getConnector <em>Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPart <em>Part</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getBus <em>Bus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareComponentTypeImpl#getPortGroup <em>Port Group</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HardwareComponentTypeImpl extends ContextImpl implements HardwareComponentType {
@@ -62,6 +62,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -72,6 +73,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	 * The cached value of the '{@link #getBus() <em>Bus</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBus()
 	 * @generated
 	 * @ordered
@@ -82,6 +84,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	 * The cached value of the '{@link #getPortGroup() <em>Port Group</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPortGroup()
 	 * @generated
 	 * @ordered
@@ -90,6 +93,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwareComponentTypeImpl() {
@@ -98,76 +102,81 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__CONNECTOR:
-				return getConnector();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT:
-				return getPort();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PART:
-				return getPart();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
-				return getBus();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
-				return getPortGroup();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__CONNECTOR:
+			return getConnector();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT:
+			return getPort();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PART:
+			return getPart();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
+			return getBus();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
+			return getPortGroup();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__CONNECTOR:
-				return !getConnector().isEmpty();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT:
-				return !getPort().isEmpty();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PART:
-				return !getPart().isEmpty();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
-				return base_Class != null;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
-				return bus != null && !bus.isEmpty();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
-				return portGroup != null && !portGroup.isEmpty();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__CONNECTOR:
+			return !getConnector().isEmpty();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT:
+			return !getPort().isEmpty();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PART:
+			return !getPart().isEmpty();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
+			return base_Class != null;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
+			return bus != null && !bus.isEmpty();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
+			return portGroup != null && !portGroup.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
-				getBus().clear();
-				getBus().addAll((Collection<? extends LogicalBus>)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
-				getPortGroup().clear();
-				getPortGroup().addAll((Collection<? extends HardwarePinGroup>)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
+			getBus().clear();
+			getBus().addAll((Collection<? extends LogicalBus>)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
+			getPortGroup().clear();
+			getPortGroup().addAll((Collection<? extends HardwarePinGroup>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,20 +186,21 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
-				getBus().clear();
-				return;
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
-				getPortGroup().clear();
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS:
+			getBus().clear();
+			return;
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP:
+			getPortGroup().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,10 +208,11 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<LogicalBus> getBus() {
-		if (bus == null) {
+		if(bus == null) {
 			bus = new EObjectResolvingEList<LogicalBus>(LogicalBus.class, this, HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BUS);
 		}
 		return bus;
@@ -246,8 +257,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 
 			while(it.hasNext()) {
 				Property current = it.next();
-				currentHW = (HardwareComponentPrototype)UMLUtil.getStereotypeApplication(current,
-					HardwareComponentPrototype.class);
+				currentHW = (HardwareComponentPrototype)UMLUtil.getStereotypeApplication(current, HardwareComponentPrototype.class);
 
 				if(currentHW != null) {
 					results.add(currentHW);
@@ -255,21 +265,21 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 			}
 		}
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, results.size(),
-			results.toArray());
+		return new BasicInternalEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, results.size(), results.toArray());
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -279,6 +289,7 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -288,12 +299,13 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
@@ -325,10 +337,11 @@ public class HardwareComponentTypeImpl extends ContextImpl implements HardwareCo
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwarePinGroup> getPortGroup() {
-		if (portGroup == null) {
+		if(portGroup == null) {
 			portGroup = new EObjectResolvingEList<HardwarePinGroup>(HardwarePinGroup.class, this, HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE__PORT_GROUP);
 		}
 		return portGroup;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareConnectorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareConnectorImpl.java
index 622531f83cf..3ee794bd5c3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareConnectorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwareConnectorImpl.java
@@ -41,13 +41,13 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort1_path <em>Port1 path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwareConnectorImpl#getPort2_path <em>Port2 path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HardwareConnectorImpl extends EAElementImpl implements HardwareConnector {
@@ -56,6 +56,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Connector()
 	 * @generated
 	 * @ordered
@@ -66,6 +67,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	 * The cached value of the '{@link #getPort1_path() <em>Port1 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort1_path()
 	 * @generated
 	 * @ordered
@@ -76,6 +78,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	 * The cached value of the '{@link #getPort2_path() <em>Port2 path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort2_path()
 	 * @generated
 	 * @ordered
@@ -84,6 +87,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwareConnectorImpl() {
@@ -92,72 +96,77 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
-				if (resolve) return getBase_Connector();
-				return basicGetBase_Connector();
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
-				return getPort();
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
-				return getPort1_path();
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
-				return getPort2_path();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
+			if(resolve)
+				return getBase_Connector();
+			return basicGetBase_Connector();
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
+			return getPort();
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
+			return getPort1_path();
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
+			return getPort2_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
-				return base_Connector != null;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
-				return !getPort().isEmpty();
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
-				return port1_path != null && !port1_path.isEmpty();
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
-				return port2_path != null && !port2_path.isEmpty();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
+			return base_Connector != null;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
+			return !getPort().isEmpty();
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
+			return port1_path != null && !port1_path.isEmpty();
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
+			return port2_path != null && !port2_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
-				getPort().clear();
-				getPort().addAll((Collection<? extends HardwarePin>)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				getPort1_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				getPort2_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
+			getPort().clear();
+			getPort().addAll((Collection<? extends HardwarePin>)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			getPort1_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			getPort2_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,14 +177,15 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector getBase_Connector() {
-		if (base_Connector != null && base_Connector.eIsProxy()) {
+		if(base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
 			base_Connector = (Connector)eResolveProxy(oldBase_Connector);
-			if (base_Connector != oldBase_Connector) {
-				if (eNotificationRequired())
+			if(base_Connector != oldBase_Connector) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 			}
 		}
@@ -185,6 +195,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Connector basicGetBase_Connector() {
@@ -194,34 +205,36 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
-				setBase_Connector((Connector)null);
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
-				getPort().clear();
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
-				getPort1_path().clear();
-				return;
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
-				getPort2_path().clear();
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__BASE_CONNECTOR:
+			setBase_Connector((Connector)null);
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT:
+			getPort().clear();
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH:
+			getPort1_path().clear();
+			return;
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH:
+			getPort2_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -246,8 +259,7 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 			while(it.hasNext()) {
 				ConnectorEnd currentEnd = it.next();
 				if(currentEnd.getRole() != null) {
-					currentHwPort = (HardwarePin)UMLUtil.getStereotypeApplication(currentEnd.getRole(),
-						HardwarePin.class);
+					currentHwPort = (HardwarePin)UMLUtil.getStereotypeApplication(currentEnd.getRole(), HardwarePin.class);
 
 					if(currentHwPort != null) {
 						results.add(currentHwPort);
@@ -263,10 +275,11 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getPort1_path() {
-		if (port1_path == null) {
+		if(port1_path == null) {
 			port1_path = new EObjectResolvingEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT1_PATH);
 		}
 		return port1_path;
@@ -275,10 +288,11 @@ public class HardwareConnectorImpl extends EAElementImpl implements HardwareConn
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getPort2_path() {
-		if (port2_path == null) {
+		if(port2_path == null) {
 			port2_path = new EObjectResolvingEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, HardwaremodelingPackage.HARDWARE_CONNECTOR__PORT2_PATH);
 		}
 		return port2_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinGroupImpl.java
index d8f083649f9..4a23a0341dc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinGroupImpl.java
@@ -37,20 +37,22 @@ import org.eclipse.uml2.uml.Port;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getPortGroup <em>Port Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getPortGroup <em>Port Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinGroupImpl#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGroup {
+
 	/**
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	 * The cached value of the '{@link #getPortGroup() <em>Port Group</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPortGroup()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	 * The cached value of the '{@link #getPort() <em>Port</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort()
 	 * @generated
 	 * @ordered
@@ -90,6 +95,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwarePinGroupImpl() {
@@ -99,21 +105,24 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
-				return getPortGroup();
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
-				return getPort();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
+			return getPortGroup();
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
+			return getPort();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -121,19 +130,20 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
-				return base_Port != null;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
-				return base_Class != null;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
-				return portGroup != null && !portGroup.isEmpty();
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
-				return port != null && !port.isEmpty();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
+			return base_Port != null;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
+			return base_Class != null;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
+			return portGroup != null && !portGroup.isEmpty();
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
+			return port != null && !port.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -141,26 +151,27 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
-				getPortGroup().clear();
-				getPortGroup().addAll((Collection<? extends HardwarePinGroup>)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
-				getPort().clear();
-				getPort().addAll((Collection<? extends HardwarePin>)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
+			getPortGroup().clear();
+			getPortGroup().addAll((Collection<? extends HardwarePinGroup>)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
+			getPort().clear();
+			getPort().addAll((Collection<? extends HardwarePin>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -168,6 +179,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,14 +190,15 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -195,6 +208,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -204,26 +218,28 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -233,6 +249,7 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -242,35 +259,37 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
-				getPortGroup().clear();
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
-				getPort().clear();
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP:
+			getPortGroup().clear();
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT:
+			getPort().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -278,10 +297,11 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwarePin> getPort() {
-		if (port == null) {
+		if(port == null) {
 			port = new EObjectResolvingEList<HardwarePin>(HardwarePin.class, this, HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT);
 		}
 		return port;
@@ -290,10 +310,11 @@ public class HardwarePinGroupImpl extends EAElementImpl implements HardwarePinGr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwarePinGroup> getPortGroup() {
-		if (portGroup == null) {
+		if(portGroup == null) {
 			portGroup = new EObjectResolvingEList<HardwarePinGroup>(HardwarePinGroup.class, this, HardwaremodelingPackage.HARDWARE_PIN_GROUP__PORT_GROUP);
 		}
 		return portGroup;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinImpl.java
index 0e8ee5c206d..7102e93ac44 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwarePinImpl.java
@@ -32,15 +32,15 @@ import org.eclipse.uml2.uml.Port;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getBase_Port <em>Base Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#isIsGround <em>Is Ground</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getVoltage <em>Voltage</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getDirection <em>Direction</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getImpedance <em>Impedance</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getPower <em>Power</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#isIsGround <em>Is Ground</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getVoltage <em>Voltage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getDirection <em>Direction</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getImpedance <em>Impedance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.HardwarePinImpl#getPower <em>Power</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class HardwarePinImpl extends EAElementImpl implements HardwarePin {
@@ -49,6 +49,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Port()
 	 * @generated
 	 * @ordered
@@ -139,6 +140,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	 * The default value of the '{@link #getPower() <em>Power</em>}' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPower()
 	 * @generated
 	 * @ordered
@@ -149,6 +151,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	 * The cached value of the '{@link #getPower() <em>Power</em>}' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPower()
 	 * @generated
 	 * @ordered
@@ -157,6 +160,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HardwarePinImpl() {
@@ -165,82 +169,87 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
-				if (resolve) return getBase_Port();
-				return basicGetBase_Port();
-			case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
-				return isIsGround();
-			case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
-				return getVoltage();
-			case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
-				return getDirection();
-			case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
-				return getImpedance();
-			case HardwaremodelingPackage.HARDWARE_PIN__POWER:
-				return getPower();
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
+			if(resolve)
+				return getBase_Port();
+			return basicGetBase_Port();
+		case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
+			return isIsGround();
+		case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
+			return getVoltage();
+		case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
+			return getDirection();
+		case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
+			return getImpedance();
+		case HardwaremodelingPackage.HARDWARE_PIN__POWER:
+			return getPower();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
-				return base_Port != null;
-			case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
-				return isGround != IS_GROUND_EDEFAULT;
-			case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
-				return VOLTAGE_EDEFAULT == null ? voltage != null : !VOLTAGE_EDEFAULT.equals(voltage);
-			case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
-				return direction != DIRECTION_EDEFAULT;
-			case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
-				return IMPEDANCE_EDEFAULT == null ? impedance != null : !IMPEDANCE_EDEFAULT.equals(impedance);
-			case HardwaremodelingPackage.HARDWARE_PIN__POWER:
-				return POWER_EDEFAULT == null ? power != null : !POWER_EDEFAULT.equals(power);
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
+			return base_Port != null;
+		case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
+			return isGround != IS_GROUND_EDEFAULT;
+		case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
+			return VOLTAGE_EDEFAULT == null ? voltage != null : !VOLTAGE_EDEFAULT.equals(voltage);
+		case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
+			return direction != DIRECTION_EDEFAULT;
+		case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
+			return IMPEDANCE_EDEFAULT == null ? impedance != null : !IMPEDANCE_EDEFAULT.equals(impedance);
+		case HardwaremodelingPackage.HARDWARE_PIN__POWER:
+			return POWER_EDEFAULT == null ? power != null : !POWER_EDEFAULT.equals(power);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
-				setBase_Port((Port)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
-				setIsGround((Boolean)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
-				setVoltage((Float)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
-				setDirection((EADirectionKind)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
-				setImpedance((Float)newValue);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__POWER:
-				setPower((Float)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
+			setBase_Port((Port)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
+			setIsGround((Boolean)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
+			setVoltage((Float)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
+			setDirection((EADirectionKind)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
+			setImpedance((Float)newValue);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__POWER:
+			setPower((Float)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,14 +260,15 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port getBase_Port() {
-		if (base_Port != null && base_Port.eIsProxy()) {
+		if(base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
 			base_Port = (Port)eResolveProxy(oldBase_Port);
-			if (base_Port != oldBase_Port) {
-				if (eNotificationRequired())
+			if(base_Port != oldBase_Port) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT, oldBase_Port, base_Port));
 			}
 		}
@@ -268,6 +278,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Port basicGetBase_Port() {
@@ -277,46 +288,49 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT, oldBase_Port, base_Port));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
-				setBase_Port((Port)null);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
-				setIsGround(IS_GROUND_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
-				setVoltage(VOLTAGE_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
-				setDirection(DIRECTION_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
-				setImpedance(IMPEDANCE_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.HARDWARE_PIN__POWER:
-				setPower(POWER_EDEFAULT);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.HARDWARE_PIN__BASE_PORT:
+			setBase_Port((Port)null);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND:
+			setIsGround(IS_GROUND_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE:
+			setVoltage(VOLTAGE_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__DIRECTION:
+			setDirection(DIRECTION_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE:
+			setImpedance(IMPEDANCE_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.HARDWARE_PIN__POWER:
+			setPower(POWER_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EADirectionKind getDirection() {
@@ -326,17 +340,19 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDirection(EADirectionKind newDirection) {
 		EADirectionKind oldDirection = direction;
 		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__DIRECTION, oldDirection, direction));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getImpedance() {
@@ -345,6 +361,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getPower() {
@@ -353,6 +370,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getVoltage() {
@@ -361,6 +379,7 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsGround() {
@@ -369,55 +388,61 @@ public abstract class HardwarePinImpl extends EAElementImpl implements HardwareP
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImpedance(Float newImpedance) {
 		Float oldImpedance = impedance;
 		impedance = newImpedance;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__IMPEDANCE, oldImpedance, impedance));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsGround(boolean newIsGround) {
 		boolean oldIsGround = isGround;
 		isGround = newIsGround;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__IS_GROUND, oldIsGround, isGround));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPower(Float newPower) {
 		Float oldPower = power;
 		power = newPower;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__POWER, oldPower, power));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setVoltage(Float newVoltage) {
 		Float oldVoltage = voltage;
 		voltage = newVoltage;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.HARDWARE_PIN__VOLTAGE, oldVoltage, voltage));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isGround: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingFactoryImpl.java
index 4995305d82d..2f8336ae7d5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.*;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype;
@@ -43,12 +44,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HardwaremodelingFactoryImpl extends EFactoryImpl implements HardwaremodelingFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -61,16 +65,16 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HardwaremodelingFactory init() {
 		try {
 			HardwaremodelingFactory theHardwaremodelingFactory = (HardwaremodelingFactory)EPackage.Registry.INSTANCE.getEFactory(HardwaremodelingPackage.eNS_URI);
-			if (theHardwaremodelingFactory != null) {
+			if(theHardwaremodelingFactory != null) {
 				return theHardwaremodelingFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new HardwaremodelingFactoryImpl();
@@ -80,6 +84,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingFactoryImpl() {
@@ -89,6 +94,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertLogicalBusKindToString(EDataType eDataType, Object instanceValue) {
@@ -98,48 +104,63 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN_KIND:
-				return convertIOHardwarePinKindToString(eDataType, instanceValue);
-			case HardwaremodelingPackage.LOGICAL_BUS_KIND:
-				return convertLogicalBusKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN_KIND:
+			return convertIOHardwarePinKindToString(eDataType, instanceValue);
+		case HardwaremodelingPackage.LOGICAL_BUS_KIND:
+			return convertLogicalBusKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR: return createHardwareConnector();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE: return createHardwareComponentPrototype();
-			case HardwaremodelingPackage.IO_HARDWARE_PIN: return createIOHardwarePin();
-			case HardwaremodelingPackage.POWER_HARDWARE_PIN: return createPowerHardwarePin();
-			case HardwaremodelingPackage.COMMUNICATION_HARDWARE_PIN: return createCommunicationHardwarePin();
-			case HardwaremodelingPackage.NODE: return createNode();
-			case HardwaremodelingPackage.POWER_SUPPLY: return createPowerSupply();
-			case HardwaremodelingPackage.SENSOR: return createSensor();
-			case HardwaremodelingPackage.ACTUATOR: return createActuator();
-			case HardwaremodelingPackage.LOGICAL_BUS: return createLogicalBus();
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP: return createHardwarePinGroup();
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE: return createHardwareComponentType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR:
+			return createHardwareConnector();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE:
+			return createHardwareComponentPrototype();
+		case HardwaremodelingPackage.IO_HARDWARE_PIN:
+			return createIOHardwarePin();
+		case HardwaremodelingPackage.POWER_HARDWARE_PIN:
+			return createPowerHardwarePin();
+		case HardwaremodelingPackage.COMMUNICATION_HARDWARE_PIN:
+			return createCommunicationHardwarePin();
+		case HardwaremodelingPackage.NODE:
+			return createNode();
+		case HardwaremodelingPackage.POWER_SUPPLY:
+			return createPowerSupply();
+		case HardwaremodelingPackage.SENSOR:
+			return createSensor();
+		case HardwaremodelingPackage.ACTUATOR:
+			return createActuator();
+		case HardwaremodelingPackage.LOGICAL_BUS:
+			return createLogicalBus();
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP:
+			return createHardwarePinGroup();
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE:
+			return createHardwareComponentType();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Actuator createActuator() {
@@ -150,6 +171,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CommunicationHardwarePin createCommunicationHardwarePin() {
@@ -160,23 +182,25 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN_KIND:
-				return createIOHardwarePinKindFromString(eDataType, initialValue);
-			case HardwaremodelingPackage.LOGICAL_BUS_KIND:
-				return createLogicalBusKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN_KIND:
+			return createIOHardwarePinKindFromString(eDataType, initialValue);
+		case HardwaremodelingPackage.LOGICAL_BUS_KIND:
+			return createLogicalBusKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentPrototype createHardwareComponentPrototype() {
@@ -187,6 +211,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IOHardwarePin createIOHardwarePin() {
@@ -197,6 +222,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentType createHardwareComponentType() {
@@ -207,17 +233,20 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IOHardwarePinKind createIOHardwarePinKindFromString(EDataType eDataType, String initialValue) {
 		IOHardwarePinKind result = IOHardwarePinKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertIOHardwarePinKindToString(EDataType eDataType, Object instanceValue) {
@@ -227,6 +256,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareConnector createHardwareConnector() {
@@ -237,6 +267,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwarePinGroup createHardwarePinGroup() {
@@ -247,6 +278,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LogicalBus createLogicalBus() {
@@ -257,17 +289,20 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LogicalBusKind createLogicalBusKindFromString(EDataType eDataType, String initialValue) {
 		LogicalBusKind result = LogicalBusKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Node createNode() {
@@ -278,6 +313,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PowerHardwarePin createPowerHardwarePin() {
@@ -288,6 +324,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PowerSupply createPowerSupply() {
@@ -298,6 +335,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Sensor createSensor() {
@@ -308,6 +346,7 @@ public class HardwaremodelingFactoryImpl extends EFactoryImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingPackage getHardwaremodelingPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingPackageImpl.java
index a07897a1778..a9fb5acf12b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/HardwaremodelingPackageImpl.java
@@ -102,6 +102,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HardwaremodelingPackageImpl extends EPackageImpl implements HardwaremodelingPackage {
@@ -109,6 +110,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hardwareComponentTypeEClass = null;
@@ -116,6 +118,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum ioHardwarePinKindEEnum = null;
@@ -123,6 +126,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum logicalBusKindEEnum = null;
@@ -130,6 +134,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hardwareConnectorEClass = null;
@@ -137,6 +142,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hardwarePinEClass = null;
@@ -144,6 +150,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hardwareComponentPrototypeEClass = null;
@@ -151,6 +158,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass allocationTargetEClass = null;
@@ -158,6 +166,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass logicalBusEClass = null;
@@ -165,6 +174,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hardwarePinGroupEClass = null;
@@ -172,6 +182,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass powerHardwarePinEClass = null;
@@ -179,6 +190,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass ioHardwarePinEClass = null;
@@ -186,6 +198,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass communicationHardwarePinEClass = null;
@@ -193,6 +206,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass nodeEClass = null;
@@ -200,6 +214,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass powerSupplyEClass = null;
@@ -207,6 +222,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass sensorEClass = null;
@@ -214,6 +230,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass actuatorEClass = null;
@@ -221,6 +238,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -228,16 +246,18 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * 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 HardwaremodelingPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link HardwaremodelingPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static HardwaremodelingPackage init() {
-		if (isInited) return (HardwaremodelingPackage)EPackage.Registry.INSTANCE.getEPackage(HardwaremodelingPackage.eNS_URI);
+		if(isInited)
+			return (HardwaremodelingPackage)EPackage.Registry.INSTANCE.getEPackage(HardwaremodelingPackage.eNS_URI);
 
 		// Obtain or create and register package
 		HardwaremodelingPackageImpl theHardwaremodelingPackage = (HardwaremodelingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HardwaremodelingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HardwaremodelingPackageImpl());
@@ -339,7 +359,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 		// Mark meta-data to indicate it can't be changed
 		theHardwaremodelingPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(HardwaremodelingPackage.eNS_URI, theHardwaremodelingPackage);
 		return theHardwaremodelingPackage;
@@ -348,6 +368,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -355,19 +376,19 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage#eNS_URI
 	 * @see #init()
@@ -378,14 +399,16 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -457,6 +480,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getActuator() {
@@ -466,6 +490,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAllocationTarget() {
@@ -475,6 +500,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIOHardwarePin() {
@@ -484,6 +510,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIOHardwarePin_Type() {
@@ -493,6 +520,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCommunicationHardwarePin() {
@@ -502,6 +530,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHardwareComponentPrototype() {
@@ -511,6 +540,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentPrototype_Type() {
@@ -520,6 +550,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentPrototype_Base_Property() {
@@ -529,6 +560,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHardwareComponentType() {
@@ -538,6 +570,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_Bus() {
@@ -547,6 +580,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_Connector() {
@@ -556,6 +590,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_Part() {
@@ -565,6 +600,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_Base_Class() {
@@ -574,6 +610,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_Port() {
@@ -583,6 +620,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareComponentType_PortGroup() {
@@ -592,6 +630,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getIOHardwarePinKind() {
@@ -601,6 +640,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHardwareConnector() {
@@ -610,6 +650,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareConnector_Base_Connector() {
@@ -619,6 +660,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareConnector_Port() {
@@ -628,6 +670,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareConnector_Port1_path() {
@@ -637,6 +680,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwareConnector_Port2_path() {
@@ -646,6 +690,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingFactory getHardwaremodelingFactory() {
@@ -655,6 +700,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHardwarePin() {
@@ -664,6 +710,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwarePin_Base_Port() {
@@ -673,6 +720,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHardwarePin_Direction() {
@@ -682,6 +730,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHardwarePin_Impedance() {
@@ -691,6 +740,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHardwarePin_IsGround() {
@@ -700,6 +750,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHardwarePin_Power() {
@@ -709,6 +760,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHardwarePin_Voltage() {
@@ -718,6 +770,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHardwarePinGroup() {
@@ -727,6 +780,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwarePinGroup_Base_Port() {
@@ -736,6 +790,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwarePinGroup_Base_Class() {
@@ -745,6 +800,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwarePinGroup_Port() {
@@ -754,6 +810,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHardwarePinGroup_PortGroup() {
@@ -763,6 +820,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLogicalBus() {
@@ -772,6 +830,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLogicalBus_Base_Class() {
@@ -781,6 +840,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLogicalBus_BusSpeed() {
@@ -790,6 +850,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLogicalBus_BusType() {
@@ -799,6 +860,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLogicalBus_Wire() {
@@ -808,6 +870,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLogicalBus_Wire_path() {
@@ -817,6 +880,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getLogicalBusKind() {
@@ -826,6 +890,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNode() {
@@ -835,6 +900,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNode_ExecutionRate() {
@@ -844,6 +910,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNode_NonVolatileMemory() {
@@ -853,6 +920,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNode_VolatileMemory() {
@@ -862,6 +930,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPowerHardwarePin() {
@@ -871,6 +940,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPowerSupply() {
@@ -880,6 +950,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPowerSupply_IsActive() {
@@ -889,6 +960,7 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSensor() {
@@ -896,14 +968,16 @@ public class HardwaremodelingPackageImpl extends EPackageImpl implements Hardwar
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/IOHardwarePinImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/IOHardwarePinImpl.java
index 0fdf3194dd4..344d6ccd469 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/IOHardwarePinImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/IOHardwarePinImpl.java
@@ -30,26 +30,30 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePinKind;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.IOHardwarePinImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin {
+
 	/**
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final IOHardwarePinKind TYPE_EDEFAULT = IOHardwarePinKind.DIGITAL;
+
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -59,6 +63,7 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IOHardwarePinImpl() {
@@ -68,13 +73,14 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
-				return getType();
+		switch(featureID) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
+			return getType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -82,13 +88,14 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
-				return type != TYPE_EDEFAULT;
+		switch(featureID) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
+			return type != TYPE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -96,14 +103,15 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
-				setType((IOHardwarePinKind)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
+			setType((IOHardwarePinKind)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -111,6 +119,7 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,14 +130,15 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -136,6 +146,7 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IOHardwarePinKind getType() {
@@ -145,23 +156,26 @@ public class IOHardwarePinImpl extends HardwarePinImpl implements IOHardwarePin
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(IOHardwarePinKind newType) {
 		IOHardwarePinKind oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.IO_HARDWARE_PIN__TYPE, oldType, type));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (type: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/LogicalBusImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/LogicalBusImpl.java
index b688d541025..24e17d243cf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/LogicalBusImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/LogicalBusImpl.java
@@ -37,21 +37,23 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBusKind;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBusSpeed <em>Bus Speed</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBusType <em>Bus Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getWire <em>Wire</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getWire_path <em>Wire path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBusSpeed <em>Bus Speed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getBusType <em>Bus Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getWire <em>Wire</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.LogicalBusImpl#getWire_path <em>Wire path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -62,6 +64,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The default value of the '{@link #getBusSpeed() <em>Bus Speed</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusSpeed()
 	 * @generated
 	 * @ordered
@@ -72,6 +75,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The cached value of the '{@link #getBusSpeed() <em>Bus Speed</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusSpeed()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The default value of the '{@link #getBusType() <em>Bus Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusType()
 	 * @generated
 	 * @ordered
@@ -92,6 +97,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The cached value of the '{@link #getBusType() <em>Bus Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBusType()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The cached value of the '{@link #getWire() <em>Wire</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWire()
 	 * @generated
 	 * @ordered
@@ -112,6 +119,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	 * The cached value of the '{@link #getWire_path() <em>Wire path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWire_path()
 	 * @generated
 	 * @ordered
@@ -121,6 +129,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LogicalBusImpl() {
@@ -130,22 +139,24 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
-				return getBusSpeed();
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
-				return getBusType();
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
-				return getWire();
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
-				return getWire_path();
+		switch(featureID) {
+		case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
+			return getBusSpeed();
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
+			return getBusType();
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
+			return getWire();
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
+			return getWire_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -153,21 +164,22 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
-				return base_Class != null;
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
-				return BUS_SPEED_EDEFAULT == null ? busSpeed != null : !BUS_SPEED_EDEFAULT.equals(busSpeed);
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
-				return busType != BUS_TYPE_EDEFAULT;
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
-				return wire != null && !wire.isEmpty();
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
-				return wire_path != null && !wire_path.isEmpty();
+		switch(featureID) {
+		case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
+			return base_Class != null;
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
+			return BUS_SPEED_EDEFAULT == null ? busSpeed != null : !BUS_SPEED_EDEFAULT.equals(busSpeed);
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
+			return busType != BUS_TYPE_EDEFAULT;
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
+			return wire != null && !wire.isEmpty();
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
+			return wire_path != null && !wire_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -175,29 +187,30 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
-				setBusSpeed((Float)newValue);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
-				setBusType((LogicalBusKind)newValue);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
-				getWire().clear();
-				getWire().addAll((Collection<? extends HardwareConnector>)newValue);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
-				getWire_path().clear();
-				getWire_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
+			setBusSpeed((Float)newValue);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
+			setBusType((LogicalBusKind)newValue);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
+			getWire().clear();
+			getWire().addAll((Collection<? extends HardwareConnector>)newValue);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
+			getWire_path().clear();
+			getWire_path().addAll((Collection<? extends HardwareComponentPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -205,6 +218,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,14 +229,15 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -232,6 +247,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -241,38 +257,40 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
-				setBusSpeed(BUS_SPEED_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
-				setBusType(BUS_TYPE_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
-				getWire().clear();
-				return;
-			case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
-				getWire_path().clear();
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.LOGICAL_BUS__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED:
+			setBusSpeed(BUS_SPEED_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE:
+			setBusType(BUS_TYPE_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE:
+			getWire().clear();
+			return;
+		case HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH:
+			getWire_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -280,6 +298,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getBusSpeed() {
@@ -289,6 +308,7 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LogicalBusKind getBusType() {
@@ -298,10 +318,11 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareConnector> getWire() {
-		if (wire == null) {
+		if(wire == null) {
 			wire = new EObjectResolvingEList<HardwareConnector>(HardwareConnector.class, this, HardwaremodelingPackage.LOGICAL_BUS__WIRE);
 		}
 		return wire;
@@ -310,10 +331,11 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HardwareComponentPrototype> getWire_path() {
-		if (wire_path == null) {
+		if(wire_path == null) {
 			wire_path = new EObjectResolvingEList<HardwareComponentPrototype>(HardwareComponentPrototype.class, this, HardwaremodelingPackage.LOGICAL_BUS__WIRE_PATH);
 		}
 		return wire_path;
@@ -322,35 +344,39 @@ public class LogicalBusImpl extends AllocationTargetImpl implements LogicalBus {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBusSpeed(Float newBusSpeed) {
 		Float oldBusSpeed = busSpeed;
 		busSpeed = newBusSpeed;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.LOGICAL_BUS__BUS_SPEED, oldBusSpeed, busSpeed));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBusType(LogicalBusKind newBusType) {
 		LogicalBusKind oldBusType = busType;
 		busType = newBusType == null ? BUS_TYPE_EDEFAULT : newBusType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.LOGICAL_BUS__BUS_TYPE, oldBusType, busType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (busSpeed: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/NodeImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/NodeImpl.java
index b753554da93..0df1a7f5ce5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/NodeImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/NodeImpl.java
@@ -29,64 +29,76 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getExecutionRate <em>Execution Rate</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getNonVolatileMemory <em>Non Volatile Memory</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getVolatileMemory <em>Volatile Memory</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getExecutionRate <em>Execution Rate</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getNonVolatileMemory <em>Non Volatile Memory</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.NodeImpl#getVolatileMemory <em>Volatile Memory</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class NodeImpl extends HardwareComponentTypeImpl implements Node {
+
 	/**
 	 * The default value of the '{@link #getExecutionRate() <em>Execution Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExecutionRate()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final Float EXECUTION_RATE_EDEFAULT = new Float(1.0F);
+
 	/**
 	 * The cached value of the '{@link #getExecutionRate() <em>Execution Rate</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExecutionRate()
 	 * @generated
 	 * @ordered
 	 */
 	protected Float executionRate = EXECUTION_RATE_EDEFAULT;
+
 	/**
 	 * The default value of the '{@link #getNonVolatileMemory() <em>Non Volatile Memory</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNonVolatileMemory()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int NON_VOLATILE_MEMORY_EDEFAULT = 0;
+
 	/**
 	 * The cached value of the '{@link #getNonVolatileMemory() <em>Non Volatile Memory</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNonVolatileMemory()
 	 * @generated
 	 * @ordered
 	 */
 	protected int nonVolatileMemory = NON_VOLATILE_MEMORY_EDEFAULT;
+
 	/**
 	 * The default value of the '{@link #getVolatileMemory() <em>Volatile Memory</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVolatileMemory()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final int VOLATILE_MEMORY_EDEFAULT = 0;
+
 	/**
 	 * The cached value of the '{@link #getVolatileMemory() <em>Volatile Memory</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVolatileMemory()
 	 * @generated
 	 * @ordered
@@ -96,6 +108,7 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NodeImpl() {
@@ -105,17 +118,18 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.NODE__EXECUTION_RATE:
-				return getExecutionRate();
-			case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
-				return getNonVolatileMemory();
-			case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
-				return getVolatileMemory();
+		switch(featureID) {
+		case HardwaremodelingPackage.NODE__EXECUTION_RATE:
+			return getExecutionRate();
+		case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
+			return getNonVolatileMemory();
+		case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
+			return getVolatileMemory();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -123,17 +137,18 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.NODE__EXECUTION_RATE:
-				return EXECUTION_RATE_EDEFAULT == null ? executionRate != null : !EXECUTION_RATE_EDEFAULT.equals(executionRate);
-			case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
-				return nonVolatileMemory != NON_VOLATILE_MEMORY_EDEFAULT;
-			case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
-				return volatileMemory != VOLATILE_MEMORY_EDEFAULT;
+		switch(featureID) {
+		case HardwaremodelingPackage.NODE__EXECUTION_RATE:
+			return EXECUTION_RATE_EDEFAULT == null ? executionRate != null : !EXECUTION_RATE_EDEFAULT.equals(executionRate);
+		case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
+			return nonVolatileMemory != NON_VOLATILE_MEMORY_EDEFAULT;
+		case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
+			return volatileMemory != VOLATILE_MEMORY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -141,20 +156,21 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.NODE__EXECUTION_RATE:
-				setExecutionRate((Float)newValue);
-				return;
-			case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
-				setNonVolatileMemory((Integer)newValue);
-				return;
-			case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
-				setVolatileMemory((Integer)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.NODE__EXECUTION_RATE:
+			setExecutionRate((Float)newValue);
+			return;
+		case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
+			setNonVolatileMemory((Integer)newValue);
+			return;
+		case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
+			setVolatileMemory((Integer)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -162,6 +178,7 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -172,20 +189,21 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.NODE__EXECUTION_RATE:
-				setExecutionRate(EXECUTION_RATE_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
-				setNonVolatileMemory(NON_VOLATILE_MEMORY_EDEFAULT);
-				return;
-			case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
-				setVolatileMemory(VOLATILE_MEMORY_EDEFAULT);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.NODE__EXECUTION_RATE:
+			setExecutionRate(EXECUTION_RATE_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY:
+			setNonVolatileMemory(NON_VOLATILE_MEMORY_EDEFAULT);
+			return;
+		case HardwaremodelingPackage.NODE__VOLATILE_MEMORY:
+			setVolatileMemory(VOLATILE_MEMORY_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,6 +211,7 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getExecutionRate() {
@@ -202,6 +221,7 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getNonVolatileMemory() {
@@ -211,6 +231,7 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getVolatileMemory() {
@@ -220,47 +241,52 @@ public class NodeImpl extends HardwareComponentTypeImpl implements Node {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setExecutionRate(Float newExecutionRate) {
 		Float oldExecutionRate = executionRate;
 		executionRate = newExecutionRate;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.NODE__EXECUTION_RATE, oldExecutionRate, executionRate));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNonVolatileMemory(int newNonVolatileMemory) {
 		int oldNonVolatileMemory = nonVolatileMemory;
 		nonVolatileMemory = newNonVolatileMemory;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.NODE__NON_VOLATILE_MEMORY, oldNonVolatileMemory, nonVolatileMemory));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setVolatileMemory(int newVolatileMemory) {
 		int oldVolatileMemory = volatileMemory;
 		volatileMemory = newVolatileMemory;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.NODE__VOLATILE_MEMORY, oldVolatileMemory, volatileMemory));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (executionRate: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerHardwarePinImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerHardwarePinImpl.java
index 6f9557dcc44..a70741abf9b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerHardwarePinImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerHardwarePinImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class PowerHardwarePinImpl extends HardwarePinImpl implements PowerHardwarePin {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PowerHardwarePinImpl() {
@@ -42,6 +44,7 @@ public class PowerHardwarePinImpl extends HardwarePinImpl implements PowerHardwa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerSupplyImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerSupplyImpl.java
index f16d2fd1927..794dff61605 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerSupplyImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/PowerSupplyImpl.java
@@ -29,17 +29,19 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl#isIsActive <em>Is Active</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.impl.PowerSupplyImpl#isIsActive <em>Is Active</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerSupply {
+
 	/**
 	 * The default value of the '{@link #isIsActive() <em>Is Active</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsActive()
 	 * @generated
 	 * @ordered
@@ -50,6 +52,7 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	 * The cached value of the '{@link #isIsActive() <em>Is Active</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsActive()
 	 * @generated
 	 * @ordered
@@ -59,6 +62,7 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PowerSupplyImpl() {
@@ -68,13 +72,14 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
-				return isIsActive();
+		switch(featureID) {
+		case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
+			return isIsActive();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -82,13 +87,14 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
-				return isActive != IS_ACTIVE_EDEFAULT;
+		switch(featureID) {
+		case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
+			return isActive != IS_ACTIVE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -96,14 +102,15 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
-				setIsActive((Boolean)newValue);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
+			setIsActive((Boolean)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -111,6 +118,7 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,14 +129,15 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
-				setIsActive(IS_ACTIVE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE:
+			setIsActive(IS_ACTIVE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -136,6 +145,7 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsActive() {
@@ -145,23 +155,26 @@ public class PowerSupplyImpl extends HardwareComponentTypeImpl implements PowerS
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsActive(boolean newIsActive) {
 		boolean oldIsActive = isActive;
 		isActive = newIsActive;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, HardwaremodelingPackage.POWER_SUPPLY__IS_ACTIVE, oldIsActive, isActive));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isActive: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/SensorImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/SensorImpl.java
index bb8ba56b377..7a34f474355 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/SensorImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/impl/SensorImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class SensorImpl extends HardwareComponentTypeImpl implements Sensor {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SensorImpl() {
@@ -42,6 +44,7 @@ public class SensorImpl extends HardwareComponentTypeImpl implements Sensor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingAdapterFactory.java
index 45a2a7c747e..ec5289e54ef 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.*;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin;
@@ -43,14 +44,17 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage
  * @generated
  */
 public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HardwaremodelingPackage modelPackage;
@@ -59,88 +63,106 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected HardwaremodelingSwitch<Adapter> modelSwitch =
-		new HardwaremodelingSwitch<Adapter>() {
-			@Override
-			public Adapter caseHardwareConnector(HardwareConnector object) {
-				return createHardwareConnectorAdapter();
-			}
-			@Override
-			public Adapter caseHardwarePin(HardwarePin object) {
-				return createHardwarePinAdapter();
-			}
-			@Override
-			public Adapter caseHardwareComponentPrototype(HardwareComponentPrototype object) {
-				return createHardwareComponentPrototypeAdapter();
-			}
-			@Override
-			public Adapter caseAllocationTarget(AllocationTarget object) {
-				return createAllocationTargetAdapter();
-			}
-			@Override
-			public Adapter caseIOHardwarePin(IOHardwarePin object) {
-				return createIOHardwarePinAdapter();
-			}
-			@Override
-			public Adapter casePowerHardwarePin(PowerHardwarePin object) {
-				return createPowerHardwarePinAdapter();
-			}
-			@Override
-			public Adapter caseCommunicationHardwarePin(CommunicationHardwarePin object) {
-				return createCommunicationHardwarePinAdapter();
-			}
-			@Override
-			public Adapter caseNode(Node object) {
-				return createNodeAdapter();
-			}
-			@Override
-			public Adapter casePowerSupply(PowerSupply object) {
-				return createPowerSupplyAdapter();
-			}
-			@Override
-			public Adapter caseSensor(Sensor object) {
-				return createSensorAdapter();
-			}
-			@Override
-			public Adapter caseActuator(Actuator object) {
-				return createActuatorAdapter();
-			}
-			@Override
-			public Adapter caseLogicalBus(LogicalBus object) {
-				return createLogicalBusAdapter();
-			}
-			@Override
-			public Adapter caseHardwarePinGroup(HardwarePinGroup object) {
-				return createHardwarePinGroupAdapter();
-			}
-			@Override
-			public Adapter caseHardwareComponentType(HardwareComponentType object) {
-				return createHardwareComponentTypeAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected HardwaremodelingSwitch<Adapter> modelSwitch = new HardwaremodelingSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseHardwareConnector(HardwareConnector object) {
+			return createHardwareConnectorAdapter();
+		}
+
+		@Override
+		public Adapter caseHardwarePin(HardwarePin object) {
+			return createHardwarePinAdapter();
+		}
+
+		@Override
+		public Adapter caseHardwareComponentPrototype(HardwareComponentPrototype object) {
+			return createHardwareComponentPrototypeAdapter();
+		}
+
+		@Override
+		public Adapter caseAllocationTarget(AllocationTarget object) {
+			return createAllocationTargetAdapter();
+		}
+
+		@Override
+		public Adapter caseIOHardwarePin(IOHardwarePin object) {
+			return createIOHardwarePinAdapter();
+		}
+
+		@Override
+		public Adapter casePowerHardwarePin(PowerHardwarePin object) {
+			return createPowerHardwarePinAdapter();
+		}
+
+		@Override
+		public Adapter caseCommunicationHardwarePin(CommunicationHardwarePin object) {
+			return createCommunicationHardwarePinAdapter();
+		}
+
+		@Override
+		public Adapter caseNode(Node object) {
+			return createNodeAdapter();
+		}
+
+		@Override
+		public Adapter casePowerSupply(PowerSupply object) {
+			return createPowerSupplyAdapter();
+		}
+
+		@Override
+		public Adapter caseSensor(Sensor object) {
+			return createSensorAdapter();
+		}
+
+		@Override
+		public Adapter caseActuator(Actuator object) {
+			return createActuatorAdapter();
+		}
+
+		@Override
+		public Adapter caseLogicalBus(LogicalBus object) {
+			return createLogicalBusAdapter();
+		}
+
+		@Override
+		public Adapter caseHardwarePinGroup(HardwarePinGroup object) {
+			return createHardwarePinGroupAdapter();
+		}
+
+		@Override
+		public Adapter caseHardwareComponentType(HardwareComponentType object) {
+			return createHardwareComponentTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = HardwaremodelingPackage.eINSTANCE;
 		}
 	}
@@ -151,6 +173,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator
 	 * @generated
@@ -163,7 +186,9 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -174,11 +199,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget <em>Allocation Target</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget
+	 * <em>Allocation Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget
 	 * @generated
@@ -188,11 +215,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin <em>IO Hardware Pin</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin
+	 * <em>IO Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.IOHardwarePin
 	 * @generated
@@ -202,11 +231,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin <em>Communication Hardware Pin</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin
+	 * <em>Communication Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin
 	 * @generated
@@ -221,6 +252,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -234,6 +266,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -242,11 +275,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype <em>Hardware Component Prototype</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype
+	 * <em>Hardware Component Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentPrototype
 	 * @generated
@@ -256,11 +291,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType <em>Hardware Component Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType
+	 * <em>Hardware Component Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentType
 	 * @generated
@@ -275,6 +312,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -284,11 +322,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector <em>Hardware Connector</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector
+	 * <em>Hardware Connector</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareConnector
 	 * @generated
@@ -298,11 +338,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin <em>Hardware Pin</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin <em>Hardware Pin</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePin
 	 * @generated
@@ -312,11 +354,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup <em>Hardware Pin Group</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup
+	 * <em>Hardware Pin Group</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwarePinGroup
 	 * @generated
@@ -331,6 +375,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.LogicalBus
 	 * @generated
@@ -345,6 +390,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Node
 	 * @generated
@@ -354,11 +400,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin <em>Power Hardware Pin</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin
+	 * <em>Power Hardware Pin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerHardwarePin
 	 * @generated
@@ -368,11 +416,13 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply <em>Power Supply</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply <em>Power Supply</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.PowerSupply
 	 * @generated
@@ -387,6 +437,7 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor
 	 * @generated
@@ -400,15 +451,16 @@ public class HardwaremodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceFactoryImpl.java
index f456b48075a..d7ec621d6e0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.util.HardwaremodelingResourceImpl
  * @generated
  */
 public class HardwaremodelingResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class HardwaremodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceImpl.java
index 663c7b84d83..59da81fd67a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.util.HardwaremodelingResourceFactoryImpl
  * @generated
  */
 public class HardwaremodelingResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public HardwaremodelingResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingSwitch.java
index 18e56f59a9c..95ea809e791 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.*;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Actuator;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.AllocationTarget;
 import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.CommunicationHardwarePin;
@@ -40,21 +41,23 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.Sensor;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPackage
  * @generated
  */
 public class HardwaremodelingSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HardwaremodelingPackage modelPackage;
@@ -63,10 +66,11 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = HardwaremodelingPackage.eINSTANCE;
 		}
 	}
@@ -75,6 +79,7 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -90,7 +95,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Actuator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -105,7 +112,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Allocation Target</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -120,7 +129,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>IO Hardware Pin</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -135,7 +146,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Communication Hardware Pin</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -150,7 +163,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -165,7 +180,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hardware Component Prototype</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -180,7 +197,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hardware Component Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -195,7 +214,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -210,7 +231,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hardware Connector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -225,7 +248,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hardware Pin</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -240,7 +265,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Hardware Pin Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -255,7 +282,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Logical Bus</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -270,7 +299,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -285,7 +316,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Power Hardware Pin</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -300,7 +333,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Power Supply</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -315,7 +350,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Sensor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -330,7 +367,9 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -344,125 +383,183 @@ public class HardwaremodelingSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case HardwaremodelingPackage.HARDWARE_CONNECTOR: {
-				HardwareConnector hardwareConnector = (HardwareConnector)theEObject;
-				T result = caseHardwareConnector(hardwareConnector);
-				if (result == null) result = caseEAElement(hardwareConnector);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.HARDWARE_PIN: {
-				HardwarePin hardwarePin = (HardwarePin)theEObject;
-				T result = caseHardwarePin(hardwarePin);
-				if (result == null) result = caseEAElement(hardwarePin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE: {
-				HardwareComponentPrototype hardwareComponentPrototype = (HardwareComponentPrototype)theEObject;
-				T result = caseHardwareComponentPrototype(hardwareComponentPrototype);
-				if (result == null) result = caseAllocationTarget(hardwareComponentPrototype);
-				if (result == null) result = caseEAElement(hardwareComponentPrototype);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.ALLOCATION_TARGET: {
-				AllocationTarget allocationTarget = (AllocationTarget)theEObject;
-				T result = caseAllocationTarget(allocationTarget);
-				if (result == null) result = caseEAElement(allocationTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.IO_HARDWARE_PIN: {
-				IOHardwarePin ioHardwarePin = (IOHardwarePin)theEObject;
-				T result = caseIOHardwarePin(ioHardwarePin);
-				if (result == null) result = caseHardwarePin(ioHardwarePin);
-				if (result == null) result = caseEAElement(ioHardwarePin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.POWER_HARDWARE_PIN: {
-				PowerHardwarePin powerHardwarePin = (PowerHardwarePin)theEObject;
-				T result = casePowerHardwarePin(powerHardwarePin);
-				if (result == null) result = caseHardwarePin(powerHardwarePin);
-				if (result == null) result = caseEAElement(powerHardwarePin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.COMMUNICATION_HARDWARE_PIN: {
-				CommunicationHardwarePin communicationHardwarePin = (CommunicationHardwarePin)theEObject;
-				T result = caseCommunicationHardwarePin(communicationHardwarePin);
-				if (result == null) result = caseHardwarePin(communicationHardwarePin);
-				if (result == null) result = caseEAElement(communicationHardwarePin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.NODE: {
-				Node node = (Node)theEObject;
-				T result = caseNode(node);
-				if (result == null) result = caseHardwareComponentType(node);
-				if (result == null) result = caseContext(node);
-				if (result == null) result = caseEAElement(node);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.POWER_SUPPLY: {
-				PowerSupply powerSupply = (PowerSupply)theEObject;
-				T result = casePowerSupply(powerSupply);
-				if (result == null) result = caseHardwareComponentType(powerSupply);
-				if (result == null) result = caseContext(powerSupply);
-				if (result == null) result = caseEAElement(powerSupply);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.SENSOR: {
-				Sensor sensor = (Sensor)theEObject;
-				T result = caseSensor(sensor);
-				if (result == null) result = caseHardwareComponentType(sensor);
-				if (result == null) result = caseContext(sensor);
-				if (result == null) result = caseEAElement(sensor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.ACTUATOR: {
-				Actuator actuator = (Actuator)theEObject;
-				T result = caseActuator(actuator);
-				if (result == null) result = caseHardwareComponentType(actuator);
-				if (result == null) result = caseContext(actuator);
-				if (result == null) result = caseEAElement(actuator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.LOGICAL_BUS: {
-				LogicalBus logicalBus = (LogicalBus)theEObject;
-				T result = caseLogicalBus(logicalBus);
-				if (result == null) result = caseAllocationTarget(logicalBus);
-				if (result == null) result = caseEAElement(logicalBus);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.HARDWARE_PIN_GROUP: {
-				HardwarePinGroup hardwarePinGroup = (HardwarePinGroup)theEObject;
-				T result = caseHardwarePinGroup(hardwarePinGroup);
-				if (result == null) result = caseEAElement(hardwarePinGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE: {
-				HardwareComponentType hardwareComponentType = (HardwareComponentType)theEObject;
-				T result = caseHardwareComponentType(hardwareComponentType);
-				if (result == null) result = caseContext(hardwareComponentType);
-				if (result == null) result = caseEAElement(hardwareComponentType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case HardwaremodelingPackage.HARDWARE_CONNECTOR:
+		{
+			HardwareConnector hardwareConnector = (HardwareConnector)theEObject;
+			T result = caseHardwareConnector(hardwareConnector);
+			if(result == null)
+				result = caseEAElement(hardwareConnector);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.HARDWARE_PIN:
+		{
+			HardwarePin hardwarePin = (HardwarePin)theEObject;
+			T result = caseHardwarePin(hardwarePin);
+			if(result == null)
+				result = caseEAElement(hardwarePin);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_PROTOTYPE:
+		{
+			HardwareComponentPrototype hardwareComponentPrototype = (HardwareComponentPrototype)theEObject;
+			T result = caseHardwareComponentPrototype(hardwareComponentPrototype);
+			if(result == null)
+				result = caseAllocationTarget(hardwareComponentPrototype);
+			if(result == null)
+				result = caseEAElement(hardwareComponentPrototype);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.ALLOCATION_TARGET:
+		{
+			AllocationTarget allocationTarget = (AllocationTarget)theEObject;
+			T result = caseAllocationTarget(allocationTarget);
+			if(result == null)
+				result = caseEAElement(allocationTarget);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.IO_HARDWARE_PIN:
+		{
+			IOHardwarePin ioHardwarePin = (IOHardwarePin)theEObject;
+			T result = caseIOHardwarePin(ioHardwarePin);
+			if(result == null)
+				result = caseHardwarePin(ioHardwarePin);
+			if(result == null)
+				result = caseEAElement(ioHardwarePin);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.POWER_HARDWARE_PIN:
+		{
+			PowerHardwarePin powerHardwarePin = (PowerHardwarePin)theEObject;
+			T result = casePowerHardwarePin(powerHardwarePin);
+			if(result == null)
+				result = caseHardwarePin(powerHardwarePin);
+			if(result == null)
+				result = caseEAElement(powerHardwarePin);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.COMMUNICATION_HARDWARE_PIN:
+		{
+			CommunicationHardwarePin communicationHardwarePin = (CommunicationHardwarePin)theEObject;
+			T result = caseCommunicationHardwarePin(communicationHardwarePin);
+			if(result == null)
+				result = caseHardwarePin(communicationHardwarePin);
+			if(result == null)
+				result = caseEAElement(communicationHardwarePin);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.NODE:
+		{
+			Node node = (Node)theEObject;
+			T result = caseNode(node);
+			if(result == null)
+				result = caseHardwareComponentType(node);
+			if(result == null)
+				result = caseContext(node);
+			if(result == null)
+				result = caseEAElement(node);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.POWER_SUPPLY:
+		{
+			PowerSupply powerSupply = (PowerSupply)theEObject;
+			T result = casePowerSupply(powerSupply);
+			if(result == null)
+				result = caseHardwareComponentType(powerSupply);
+			if(result == null)
+				result = caseContext(powerSupply);
+			if(result == null)
+				result = caseEAElement(powerSupply);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.SENSOR:
+		{
+			Sensor sensor = (Sensor)theEObject;
+			T result = caseSensor(sensor);
+			if(result == null)
+				result = caseHardwareComponentType(sensor);
+			if(result == null)
+				result = caseContext(sensor);
+			if(result == null)
+				result = caseEAElement(sensor);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.ACTUATOR:
+		{
+			Actuator actuator = (Actuator)theEObject;
+			T result = caseActuator(actuator);
+			if(result == null)
+				result = caseHardwareComponentType(actuator);
+			if(result == null)
+				result = caseContext(actuator);
+			if(result == null)
+				result = caseEAElement(actuator);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.LOGICAL_BUS:
+		{
+			LogicalBus logicalBus = (LogicalBus)theEObject;
+			T result = caseLogicalBus(logicalBus);
+			if(result == null)
+				result = caseAllocationTarget(logicalBus);
+			if(result == null)
+				result = caseEAElement(logicalBus);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.HARDWARE_PIN_GROUP:
+		{
+			HardwarePinGroup hardwarePinGroup = (HardwarePinGroup)theEObject;
+			T result = caseHardwarePinGroup(hardwarePinGroup);
+			if(result == null)
+				result = caseEAElement(hardwarePinGroup);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HardwaremodelingPackage.HARDWARE_COMPONENT_TYPE:
+		{
+			HardwareComponentType hardwareComponentType = (HardwareComponentType)theEObject;
+			T result = caseHardwareComponentType(hardwareComponentType);
+			if(result == null)
+				result = caseContext(hardwareComponentType);
+			if(result == null)
+				result = caseEAElement(hardwareComponentType);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingXMLProcessor.java
index dcdaca2d250..2d49da081a3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/hardwaremodeling/util/HardwaremodelingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwaremodelingPa
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HardwaremodelingXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class HardwaremodelingXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwaremodelingXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		HardwaremodelingPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the HardwaremodelingResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new HardwaremodelingResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new HardwaremodelingResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructureFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructureFactoryImpl.java
index cf41f6ce845..23ca1f980be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructureFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructureFactoryImpl.java
@@ -21,18 +21,21 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.structure.*;

 import org.eclipse.papyrus.eastadl.structure.StructureFactory;

 import org.eclipse.papyrus.eastadl.structure.StructurePackage;

 

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class StructureFactoryImpl extends EFactoryImpl implements StructureFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -44,16 +47,16 @@ public class StructureFactoryImpl extends EFactoryImpl implements StructureFacto
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static StructureFactory init() {

 		try {

 			StructureFactory theStructureFactory = (StructureFactory)EPackage.Registry.INSTANCE.getEFactory(StructurePackage.eNS_URI);

-			if (theStructureFactory != null) {

+			if(theStructureFactory != null) {

 				return theStructureFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new StructureFactoryImpl();

@@ -62,6 +65,7 @@ public class StructureFactoryImpl extends EFactoryImpl implements StructureFacto
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StructureFactoryImpl() {

@@ -70,6 +74,7 @@ public class StructureFactoryImpl extends EFactoryImpl implements StructureFacto
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

@@ -78,32 +83,35 @@ public class StructureFactoryImpl extends EFactoryImpl implements StructureFacto
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case StructurePackage.DUMMY:

-				return convertDummyToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case StructurePackage.DUMMY:

+			return convertDummyToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String createDummyFromString(EDataType eDataType, String initialValue) {

@@ -112,20 +120,22 @@ public class StructureFactoryImpl extends EFactoryImpl implements StructureFacto
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case StructurePackage.DUMMY:

-				return createDummyFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case StructurePackage.DUMMY:

+			return createDummyFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StructurePackage getStructurePackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructurePackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructurePackageImpl.java
index eb7d6057fd0..e8a891d695b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructurePackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/impl/StructurePackageImpl.java
@@ -79,12 +79,14 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class StructurePackageImpl extends EPackageImpl implements StructurePackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -92,16 +94,18 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 	/**

 	 * 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 StructurePackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link StructurePackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static StructurePackage init() {

-		if (isInited) return (StructurePackage)EPackage.Registry.INSTANCE.getEPackage(StructurePackage.eNS_URI);

+		if(isInited)

+			return (StructurePackage)EPackage.Registry.INSTANCE.getEPackage(StructurePackage.eNS_URI);

 

 		// Obtain or create and register package

 		StructurePackageImpl theStructurePackage = (StructurePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StructurePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StructurePackageImpl());

@@ -203,7 +207,7 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 		// Mark meta-data to indicate it can't be changed

 		theStructurePackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(StructurePackage.eNS_URI, theStructurePackage);

 		return theStructurePackage;

@@ -211,31 +215,33 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EDataType dummyEDataType = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.structure.StructurePackage#eNS_URI

 	 * @see #init()

@@ -246,13 +252,15 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create data types

@@ -261,6 +269,7 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EDataType getDummy() {

@@ -269,6 +278,7 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StructureFactory getStructureFactory() {

@@ -276,13 +286,15 @@ public class StructurePackageImpl extends EPackageImpl implements StructurePacka
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/AnalysisLevel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/AnalysisLevel.java
index a52fe25f8cc..d915c46981f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/AnalysisLevel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/AnalysisLevel.java
@@ -22,42 +22,47 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.AnalysisFunctionPr
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Analysis Level</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * AnalysisLevel represents the vehicle EE system in terms of its abstract functional definition. It includes the functional analysis architecture (FAA) which represents the abstract functional structure.
+ * AnalysisLevel represents the vehicle EE system in terms of its abstract functional definition. It includes the functional analysis architecture
+ * (FAA) which represents the abstract functional structure.
  * 
  * Semantics:
- * AnalysisLevel represents the vehicle EE system in terms of its abstract functional definition. It defines the logical functionality and a logical decomposition of functionality down to the appropriate granularity.
+ * AnalysisLevel represents the vehicle EE system in terms of its abstract functional definition. It defines the logical functionality and a logical
+ * decomposition of functionality down to the appropriate granularity.
  * 
  * Notation:
- * The Analysis Architecture is shown as a solid-outline rectangle containing the name, with its ports or port groups on the perimeter. Contained entities may be shown with its connectors (White-box view).
+ * The Analysis Architecture is shown as a solid-outline rectangle containing the name, with its ports or port groups on the perimeter. Contained
+ * entities may be shown with its connectors (White-box view).
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture <em>Functional Analysis Architecture</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture <em>Functional Analysis
+ * Architecture</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getAnalysisLevel()
  * @model
  * @generated
  */
 public interface AnalysisLevel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getAnalysisLevel_Base_Class()
@@ -70,7 +75,9 @@ public interface AnalysisLevel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -80,10 +87,10 @@ public interface AnalysisLevel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getAnalysisLevel_Base_Package()
@@ -93,10 +100,13 @@ public interface AnalysisLevel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -106,10 +116,11 @@ public interface AnalysisLevel extends Context {
 	 * Returns the value of the '<em><b>Functional Analysis Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Functional Analysis Architecture</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Functional Analysis Architecture</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Functional Analysis Architecture</em>' reference.
 	 * @see #setFunctionalAnalysisArchitecture(AnalysisFunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getAnalysisLevel_FunctionalAnalysisArchitecture()
@@ -119,10 +130,13 @@ public interface AnalysisLevel extends Context {
 	AnalysisFunctionPrototype getFunctionalAnalysisArchitecture();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture <em>Functional Analysis Architecture</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture
+	 * <em>Functional Analysis Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Functional Analysis Architecture</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Functional Analysis Architecture</em>' reference.
 	 * @see #getFunctionalAnalysisArchitecture()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/DesignLevel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/DesignLevel.java
index 54d6fddfb33..f97b6641e67 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/DesignLevel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/DesignLevel.java
@@ -26,17 +26,24 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentP
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Design Level</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * DesignLevel represents the vehicle EE system on the design abstraction level. It includes primarily the Functional Design Architecture (FDA), and the HardwareDesignArchitecture (HDA).
+ * DesignLevel represents the vehicle EE system on the design abstraction level. It includes primarily the Functional Design Architecture (FDA), and
+ * the HardwareDesignArchitecture (HDA).
  * 
- * FDA represents a top level Function. It is supposed to implement all the functionalities of a vehicle, as specified by a Functional Analysis Architecture or a Vehicle level (if no Functional Analysis Architecture has been defined during the process).
+ * FDA represents a top level Function. It is supposed to implement all the functionalities of a vehicle, as specified by a Functional Analysis
+ * Architecture or a Vehicle level (if no Functional Analysis Architecture has been defined during the process).
  * 
- * The design level in EAST-ADL2 includes the design architecture containing the functional specification and hardware architecture of the vehicle EE system. The design architecture includes the Functional Design Architecture representing a decomposition of functionalities analyzed on the analysis level. The decomposition has the purpose of making it possible to meet constraints regarding non-functional properties such as allocation, efficiency, reuse, or supplier concerns. There is an n-to-m mapping between entities of the design- and the ones on the analysis level. 
+ * The design level in EAST-ADL2 includes the design architecture containing the functional specification and hardware architecture of the vehicle EE
+ * system. The design architecture includes the Functional Design Architecture representing a decomposition of functionalities analyzed on the
+ * analysis level. The decomposition has the purpose of making it possible to meet constraints regarding non-functional properties such as allocation,
+ * efficiency, reuse, or supplier concerns. There is an n-to-m mapping between entities of the design- and the ones on the analysis level.
  * 
- * Non-transparent infrastructure functionality such as mode changes and error handling are also represented at the design level, such that their impact on applications' behaviors can be estimated.
+ * Non-transparent infrastructure functionality such as mode changes and error handling are also represented at the design level, such that their
+ * impact on applications' behaviors can be estimated.
  * 
- * The Functional Design Architecture parts are typed by FunctionTypes and LocalDeviceManagers. The view of the HardwareArchitecture facilitates the realization of LocalDeviceManager as sensor/actuator HW elements.
+ * The Functional Design Architecture parts are typed by FunctionTypes and LocalDeviceManagers. The view of the HardwareArchitecture facilitates the
+ * realization of LocalDeviceManager as sensor/actuator HW elements.
  * 
  * The HDA is the hardware design from a system perspective. The HDA has two purposes:
  * 
@@ -44,42 +51,47 @@ import org.eclipse.papyrus.eastadl.structure.hardwaremodeling.HardwareComponentP
  * 
  * 2) It is an allocation target for the Functions of the Functional Design Architecture.
  * 
- * The HDA represents the hardware architecture of the embedded system. Its contained HW elements represent the physical aspects of the hardware entities and how they are connected. HardwareFunctionTypes associated to HW components represent the logical behavior of the contained HW elements. 
+ * The HDA represents the hardware architecture of the embedded system. Its contained HW elements represent the physical aspects of the hardware
+ * entities and how they are connected. HardwareFunctionTypes associated to HW components represent the logical behavior of the contained HW elements.
  * 
  * Semantics:
- * The DesignLevel is the representation of the vehicle EE system on the design abstraction level. It corresponds to the design of logical functions and boundaries extended in regards to resource commitment.
+ * The DesignLevel is the representation of the vehicle EE system on the design abstraction level. It corresponds to the design of logical functions
+ * and boundaries extended in regards to resource commitment.
  * 
  * Notation:
- * The DesignLevel is shown as a solid-outline rectangle containing the name, with its ports or port groups on the perimeter. Contained entities may be shown with its connectors (White-box view).
+ * The DesignLevel is shown as a solid-outline rectangle containing the name, with its ports or port groups on the perimeter. Contained entities may
+ * be shown with its connectors (White-box view).
  * 
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture <em>Functional Design Architecture</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getAllocation <em>Allocation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture <em>Functional Design Architecture
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getAllocation <em>Allocation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel()
  * @model
  * @generated
  */
 public interface DesignLevel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel_Base_Class()
@@ -92,7 +104,9 @@ public interface DesignLevel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -102,10 +116,10 @@ public interface DesignLevel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel_Base_Package()
@@ -115,10 +129,13 @@ public interface DesignLevel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -129,10 +146,10 @@ public interface DesignLevel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.Allocation}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Allocation</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Allocation</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Allocation</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel_Allocation()
 	 * @model ordered="false"
@@ -144,6 +161,7 @@ public interface DesignLevel extends Context {
 	 * Returns the value of the '<em><b>Functional Design Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Functional Design Architecture</em>' reference.
 	 * @see #setFunctionalDesignArchitecture(DesignFunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel_FunctionalDesignArchitecture()
@@ -156,10 +174,11 @@ public interface DesignLevel extends Context {
 	 * Returns the value of the '<em><b>Hardware Design Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hardware Design Architecture</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hardware Design Architecture</em>' containment reference isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hardware Design Architecture</em>' reference.
 	 * @see #setHardwareDesignArchitecture(HardwareComponentPrototype)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getDesignLevel_HardwareDesignArchitecture()
@@ -169,20 +188,26 @@ public interface DesignLevel extends Context {
 	HardwareComponentPrototype getHardwareDesignArchitecture();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture <em>Functional Design Architecture</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture
+	 * <em>Functional Design Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Functional Design Architecture</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Functional Design Architecture</em>' reference.
 	 * @see #getFunctionalDesignArchitecture()
 	 * @generated
 	 */
 	void setFunctionalDesignArchitecture(DesignFunctionPrototype value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture
+	 * <em>Hardware Design Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hardware Design Architecture</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Hardware Design Architecture</em>' reference.
 	 * @see #getHardwareDesignArchitecture()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/ImplementationLevel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/ImplementationLevel.java
index ddda2026257..bb2ef501134 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/ImplementationLevel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/ImplementationLevel.java
@@ -23,32 +23,37 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Implementation Level</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ImplementationLevel represents the software architecture and components, and the hardware architecture of the EE system in the vehicle. The ImplementationLevel is defined by the AUTOSAR System- and SoftwareArchitecture. For example, functions of the Functional Design Architecture will be realized by AUTOSAR SW-Components in the ImplementationLevel. Traceability is supported from implementation level elements (AUTOSAR) to upper level elements by Realization relationships.
+ * ImplementationLevel represents the software architecture and components, and the hardware architecture of the EE system in the vehicle. The
+ * ImplementationLevel is defined by the AUTOSAR System- and SoftwareArchitecture. For example, functions of the Functional Design Architecture will
+ * be realized by AUTOSAR SW-Components in the ImplementationLevel. Traceability is supported from implementation level elements (AUTOSAR) to upper
+ * level elements by Realization relationships.
  * 
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem <em>Autosar System</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem <em>Autosar System</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getImplementationLevel()
  * @model
  * @generated
  */
 public interface ImplementationLevel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Autosar System</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Autosar System</em>' reference.
 	 * @see #setAutosarSystem(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getImplementationLevel_AutosarSystem()
@@ -58,10 +63,13 @@ public interface ImplementationLevel extends Context {
 	NamedElement getAutosarSystem();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem <em>Autosar System</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem
+	 * <em>Autosar System</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Autosar System</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Autosar System</em>' reference.
 	 * @see #getAutosarSystem()
 	 * @generated
 	 */
@@ -71,10 +79,10 @@ public interface ImplementationLevel extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getImplementationLevel_Base_Class()
@@ -84,10 +92,13 @@ public interface ImplementationLevel extends Context {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -97,10 +108,10 @@ public interface ImplementationLevel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getImplementationLevel_Base_Package()
@@ -110,10 +121,13 @@ public interface ImplementationLevel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemModel.java
index 4f151a93937..e6e89625ff1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemModel.java
@@ -21,38 +21,42 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>System Model</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * SystemModel is used to organize models/architectures according to their abstraction level; it can also hold with relationships between the different levels.
+ * SystemModel is used to organize models/architectures according to their abstraction level; it can also hold with relationships between the
+ * different levels.
  * 
  * Semantics:
  * The SystemModel represents the EE system of the vehicle, and concepts related to the various abstraction levels.
  * 
  * Notation:
- * The default notation for a SystemModel is a solid-outline rectangle containing the SystemModel's name, and with compartments separating by horizontal lines containing features or other members of the SystemModel. Contained entities may also be shown with its connectors (White-box view).
+ * The default notation for a SystemModel is a solid-outline rectangle containing the SystemModel's name, and with compartments separating by
+ * horizontal lines containing features or other members of the SystemModel. Contained entities may also be shown with its connectors (White-box
+ * view).
  * 
  * Changes: New class in EAST-ADL2
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel <em>Implementation Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel <em>Analysis Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel <em>Design Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel <em>Vehicle Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel <em>Implementation Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel <em>Analysis Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel <em>Design Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel <em>Vehicle Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel()
  * @model
  * @generated
  */
 public interface SystemModel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Analysis Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -60,6 +64,7 @@ public interface SystemModel extends Context {
 	 * <!-- begin-model-doc -->
 	 * The AnalysisArchitecture contained in the SystemModel and connected to the EnvironmentModel through ports-connectors
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Analysis Level</em>' reference.
 	 * @see #setAnalysisLevel(AnalysisLevel)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_AnalysisLevel()
@@ -75,6 +80,7 @@ public interface SystemModel extends Context {
 	 * <!-- begin-model-doc -->
 	 * The designArchitecture contained in the SystemModel and connected to the EnvironmentModel through ports-connectors
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Design Level</em>' reference.
 	 * @see #setDesignLevel(DesignLevel)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_DesignLevel()
@@ -90,6 +96,7 @@ public interface SystemModel extends Context {
 	 * <!-- begin-model-doc -->
 	 * The Implementation Architecture abstraction level.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Implementation Level</em>' reference.
 	 * @see #setImplementationLevel(ImplementationLevel)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_ImplementationLevel()
@@ -105,6 +112,7 @@ public interface SystemModel extends Context {
 	 * <!-- begin-model-doc -->
 	 * The Vehicle Feature Model contained in the SystemModel.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Vehicle Level</em>' reference.
 	 * @see #setVehicleLevel(VehicleLevel)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_VehicleLevel()
@@ -114,40 +122,52 @@ public interface SystemModel extends Context {
 	VehicleLevel getVehicleLevel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel <em>Analysis Level</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel <em>Analysis Level</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Analysis Level</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Analysis Level</em>' reference.
 	 * @see #getAnalysisLevel()
 	 * @generated
 	 */
 	void setAnalysisLevel(AnalysisLevel value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel <em>Design Level</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel <em>Design Level</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Design Level</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Design Level</em>' reference.
 	 * @see #getDesignLevel()
 	 * @generated
 	 */
 	void setDesignLevel(DesignLevel value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel <em>Implementation Level</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel
+	 * <em>Implementation Level</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implementation Level</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Implementation Level</em>' reference.
 	 * @see #getImplementationLevel()
 	 * @generated
 	 */
 	void setImplementationLevel(ImplementationLevel value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel <em>Vehicle Level</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel <em>Vehicle Level</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Vehicle Level</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Vehicle Level</em>' reference.
 	 * @see #getVehicleLevel()
 	 * @generated
 	 */
@@ -157,10 +177,10 @@ public interface SystemModel extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_Base_Class()
@@ -173,7 +193,9 @@ public interface SystemModel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -183,10 +205,10 @@ public interface SystemModel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getSystemModel_Base_Package()
@@ -196,10 +218,13 @@ public interface SystemModel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingFactory.java
index ef986e54082..25a0ca46935 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage
  * @generated
  */
 public interface SystemmodelingFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SystemmodelingFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Analysis Level</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Analysis Level</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Design Level</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Design Level</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Implementation Level</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Implementation Level</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>System Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>System Model</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Vehicle Level</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Vehicle Level</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface SystemmodelingFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingPackage.java
index 335b5bd3653..b6fa40c5f1b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/SystemmodelingPackage.java
@@ -26,47 +26,59 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
- * The ADLSystemModel is the top level container of an EAST-ADL2 model. It represents the electronics & software of the vehicle, and its environment, and concepts related to the various abstraction level of models used in EAST-ADL2. It is mainly based on both concepts: Models and architectures.
+ * The ADLSystemModel is the top level container of an EAST-ADL2 model. It represents the electronics & software of the vehicle, and its environment,
+ * and concepts related to the various abstraction level of models used in EAST-ADL2. It is mainly based on both concepts: Models and architectures.
  * VehicleFeatureModel represents the features of the vehicle, i.e. the externally visible properties
  * The AnalysisArchitecture is the abstract functional description of the vehicle electronics
  * The DesignArchitecture contains the functional specification and hardware architecture of the vehicle electronics
  * The Implementation Architecture contains the software architecture and components and the hardware architecture of the vehicle
  * The Operational Architecture represents the actual software and electronics in the manufactured vehicle
- * The word model vs. architecture is chosen rather informally. Architecture is used where this term is often used in practice, and where the construct is a complete (in some sense) reflection of the aspects that it captures. Model is used in other cases.
- * These models/architectures contain further elements in a hierarchy.. Relations between these elements over the boundaries between the models/architectures are contained in the ADLSystemModel. This is possible because the SystemModel is a specialization of the ADLContext, and is thus able to contain relations. Typical relations are described in the sub-package CoreConstructs (see definition of ADLRelationship, ADLRealization and ADLSatisfy).
+ * The word model vs. architecture is chosen rather informally. Architecture is used where this term is often used in practice, and where the
+ * construct is a complete (in some sense) reflection of the aspects that it captures. Model is used in other cases.
+ * These models/architectures contain further elements in a hierarchy.. Relations between these elements over the boundaries between the
+ * models/architectures are contained in the ADLSystemModel. This is possible because the SystemModel is a specialization of the ADLContext, and is
+ * thus able to contain relations. Typical relations are described in the sub-package CoreConstructs (see definition of ADLRelationship,
+ * ADLRealization and ADLSatisfy).
  * 
  * Overview:
- * The ADLSystemModel is the top level container of an EAST-ADL2 model. It represents the electronics & software of the vehicle, and its environment, and concepts related to the various abstraction level of models used in EAST-ADL2. It is mainly based on both concepts: Models and architectures.
+ * The ADLSystemModel is the top level container of an EAST-ADL2 model. It represents the electronics & software of the vehicle, and its environment,
+ * and concepts related to the various abstraction level of models used in EAST-ADL2. It is mainly based on both concepts: Models and architectures.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingFactory
  * @model kind="package"
  * @generated
  */
 public interface SystemmodelingPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl <em>System Model</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl <em>System Model</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getSystemModel()
 		 * @generated
@@ -77,6 +89,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Implementation Level</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__IMPLEMENTATION_LEVEL = eINSTANCE.getSystemModel_ImplementationLevel();
@@ -85,6 +98,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Analysis Level</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__ANALYSIS_LEVEL = eINSTANCE.getSystemModel_AnalysisLevel();
@@ -93,6 +107,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Design Level</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__DESIGN_LEVEL = eINSTANCE.getSystemModel_DesignLevel();
@@ -101,6 +116,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Vehicle Level</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__VEHICLE_LEVEL = eINSTANCE.getSystemModel_VehicleLevel();
@@ -109,6 +125,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__BASE_CLASS = eINSTANCE.getSystemModel_Base_Class();
@@ -117,14 +134,17 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SYSTEM_MODEL__BASE_PACKAGE = eINSTANCE.getSystemModel_Base_Package();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl <em>Implementation Level</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl
+		 * <em>Implementation Level</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getImplementationLevel()
 		 * @generated
@@ -135,6 +155,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Autosar System</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM = eINSTANCE.getImplementationLevel_AutosarSystem();
@@ -143,6 +164,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMPLEMENTATION_LEVEL__BASE_CLASS = eINSTANCE.getImplementationLevel_Base_Class();
@@ -151,14 +173,17 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMPLEMENTATION_LEVEL__BASE_PACKAGE = eINSTANCE.getImplementationLevel_Base_Package();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl <em>Analysis Level</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl
+		 * <em>Analysis Level</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getAnalysisLevel()
 		 * @generated
@@ -169,6 +194,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANALYSIS_LEVEL__BASE_CLASS = eINSTANCE.getAnalysisLevel_Base_Class();
@@ -177,6 +203,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANALYSIS_LEVEL__BASE_PACKAGE = eINSTANCE.getAnalysisLevel_Base_Package();
@@ -185,14 +212,17 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Functional Analysis Architecture</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE = eINSTANCE.getAnalysisLevel_FunctionalAnalysisArchitecture();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl <em>Design Level</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl <em>Design Level</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getDesignLevel()
 		 * @generated
@@ -203,6 +233,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DESIGN_LEVEL__BASE_CLASS = eINSTANCE.getDesignLevel_Base_Class();
@@ -211,6 +242,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DESIGN_LEVEL__BASE_PACKAGE = eINSTANCE.getDesignLevel_Base_Package();
@@ -219,6 +251,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Functional Design Architecture</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE = eINSTANCE.getDesignLevel_FunctionalDesignArchitecture();
@@ -227,6 +260,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Hardware Design Architecture</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE = eINSTANCE.getDesignLevel_HardwareDesignArchitecture();
@@ -235,14 +269,17 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Allocation</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DESIGN_LEVEL__ALLOCATION = eINSTANCE.getDesignLevel_Allocation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl <em>Vehicle Level</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl <em>Vehicle Level</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl
 		 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getVehicleLevel()
 		 * @generated
@@ -253,6 +290,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_LEVEL__BASE_PACKAGE = eINSTANCE.getVehicleLevel_Base_Package();
@@ -261,6 +299,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_LEVEL__BASE_CLASS = eINSTANCE.getVehicleLevel_Base_Class();
@@ -269,6 +308,7 @@ public interface SystemmodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Technical Feature Model</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL = eINSTANCE.getVehicleLevel_TechnicalFeatureModel();
@@ -279,6 +319,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "systemmodeling";
@@ -287,6 +328,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/SystemModeling/1";
@@ -295,6 +337,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "SystemModeling";
@@ -303,6 +346,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	SystemmodelingPackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl.init();
@@ -311,6 +355,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl <em>System Model</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getSystemModel()
 	 * @generated
@@ -318,9 +363,11 @@ public interface SystemmodelingPackage extends EPackage {
 	int SYSTEM_MODEL = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl <em>Implementation Level</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl
+	 * <em>Implementation Level</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getImplementationLevel()
 	 * @generated
@@ -331,6 +378,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl <em>Analysis Level</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getAnalysisLevel()
 	 * @generated
@@ -341,6 +389,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl <em>Design Level</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getDesignLevel()
 	 * @generated
@@ -351,6 +400,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -360,6 +410,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -369,6 +420,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -378,6 +430,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -387,6 +440,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -396,6 +450,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Implementation Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -405,6 +460,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Analysis Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -414,6 +470,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Design Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -423,6 +480,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Vehicle Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -432,6 +490,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -441,6 +500,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -450,6 +510,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>System Model</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -459,6 +520,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -468,6 +530,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -477,6 +540,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -486,6 +550,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -495,6 +560,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -504,6 +570,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Autosar System</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -513,6 +580,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -522,6 +590,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -531,6 +600,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Implementation Level</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -540,6 +610,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -549,6 +620,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -558,6 +630,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -567,6 +640,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -576,6 +650,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -585,6 +660,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -594,6 +670,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -603,6 +680,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Functional Analysis Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -612,6 +690,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Analysis Level</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -621,6 +700,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -630,6 +710,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -639,6 +720,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -648,6 +730,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -657,6 +740,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -666,6 +750,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -675,6 +760,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -684,6 +770,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Functional Design Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -693,6 +780,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Hardware Design Architecture</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -702,6 +790,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allocation</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -711,6 +800,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Design Level</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -720,6 +810,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl <em>Vehicle Level</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemmodelingPackageImpl#getVehicleLevel()
 	 * @generated
@@ -730,6 +821,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -739,6 +831,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -748,6 +841,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -757,6 +851,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -766,6 +861,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -775,6 +871,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -784,6 +881,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -793,6 +891,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Technical Feature Model</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -802,6 +901,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * The number of structural features of the '<em>Vehicle Level</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -811,6 +911,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel <em>Analysis Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Analysis Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel
 	 * @generated
@@ -818,9 +919,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EClass getAnalysisLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Class()
 	 * @see #getAnalysisLevel()
@@ -829,9 +932,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getAnalysisLevel_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getBase_Package()
 	 * @see #getAnalysisLevel()
@@ -840,9 +945,12 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getAnalysisLevel_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture <em>Functional Analysis Architecture</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture
+	 * <em>Functional Analysis Architecture</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Functional Analysis Architecture</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel#getFunctionalAnalysisArchitecture()
 	 * @see #getAnalysisLevel()
@@ -854,6 +962,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel <em>Design Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Design Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel
 	 * @generated
@@ -861,9 +970,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EClass getDesignLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Class()
 	 * @see #getDesignLevel()
@@ -872,9 +983,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getDesignLevel_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getBase_Package()
 	 * @see #getDesignLevel()
@@ -883,9 +996,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getDesignLevel_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getAllocation <em>Allocation</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getAllocation
+	 * <em>Allocation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Allocation</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getAllocation()
 	 * @see #getDesignLevel()
@@ -894,9 +1009,12 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getDesignLevel_Allocation();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture <em>Functional Design Architecture</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture
+	 * <em>Functional Design Architecture</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Functional Design Architecture</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getFunctionalDesignArchitecture()
 	 * @see #getDesignLevel()
@@ -905,9 +1023,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getDesignLevel_FunctionalDesignArchitecture();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hardware Design Architecture</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel#getHardwareDesignArchitecture()
 	 * @see #getDesignLevel()
@@ -916,9 +1036,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getDesignLevel_HardwareDesignArchitecture();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel <em>Implementation Level</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel
+	 * <em>Implementation Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Implementation Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel
 	 * @generated
@@ -926,9 +1048,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EClass getImplementationLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem <em>Autosar System</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem
+	 * <em>Autosar System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Autosar System</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getAutosarSystem()
 	 * @see #getImplementationLevel()
@@ -937,9 +1061,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getImplementationLevel_AutosarSystem();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Class()
 	 * @see #getImplementationLevel()
@@ -948,9 +1074,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getImplementationLevel_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel#getBase_Package()
 	 * @see #getImplementationLevel()
@@ -962,6 +1090,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel <em>System Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>System Model</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel
 	 * @generated
@@ -969,9 +1098,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EClass getSystemModel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel <em>Analysis Level</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel
+	 * <em>Analysis Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Analysis Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getAnalysisLevel()
 	 * @see #getSystemModel()
@@ -980,9 +1111,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getSystemModel_AnalysisLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel <em>Design Level</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel
+	 * <em>Design Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Design Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getDesignLevel()
 	 * @see #getSystemModel()
@@ -991,9 +1124,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getSystemModel_DesignLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel <em>Implementation Level</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel
+	 * <em>Implementation Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Implementation Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getImplementationLevel()
 	 * @see #getSystemModel()
@@ -1002,9 +1137,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getSystemModel_ImplementationLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel <em>Vehicle Level</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel
+	 * <em>Vehicle Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Vehicle Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getVehicleLevel()
 	 * @see #getSystemModel()
@@ -1013,9 +1150,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getSystemModel_VehicleLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Class()
 	 * @see #getSystemModel()
@@ -1024,9 +1163,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getSystemModel_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel#getBase_Package()
 	 * @see #getSystemModel()
@@ -1038,6 +1179,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1047,6 +1189,7 @@ public interface SystemmodelingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel <em>Vehicle Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Vehicle Level</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel
 	 * @generated
@@ -1054,9 +1197,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EClass getVehicleLevel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package <em>Base Package</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package
+	 * <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package()
 	 * @see #getVehicleLevel()
@@ -1065,9 +1210,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getVehicleLevel_Base_Package();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class <em>Base Class</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class
+	 * <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class()
 	 * @see #getVehicleLevel()
@@ -1076,9 +1223,11 @@ public interface SystemmodelingPackage extends EPackage {
 	EReference getVehicleLevel_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getTechnicalFeatureModel <em>Technical Feature Model</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getTechnicalFeatureModel <em>Technical Feature Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Technical Feature Model</em>'.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getTechnicalFeatureModel()
 	 * @see #getVehicleLevel()
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/VehicleLevel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/VehicleLevel.java
index eaf325e6cce..6ed2a397819 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/VehicleLevel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/VehicleLevel.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Vehicle Level</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * VehicleLevel represents an arbitrary set of feature models containing only VehicleFeatures.
  * 
@@ -36,29 +36,30 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * 
  * Extension: class.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getTechnicalFeatureModel <em>Technical Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getTechnicalFeatureModel <em>Technical Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getVehicleLevel()
  * @model
  * @generated
  */
 public interface VehicleLevel extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getVehicleLevel_Base_Package()
@@ -68,10 +69,13 @@ public interface VehicleLevel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -81,10 +85,10 @@ public interface VehicleLevel extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getVehicleLevel_Base_Class()
@@ -97,7 +101,9 @@ public interface VehicleLevel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -108,10 +114,11 @@ public interface VehicleLevel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Technical Feature Model</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Technical Feature Model</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Technical Feature Model</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#getVehicleLevel_TechnicalFeatureModel()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/AnalysisLevelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/AnalysisLevelImpl.java
index 18a1d192c77..b1f8d456458 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/AnalysisLevelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/AnalysisLevelImpl.java
@@ -32,19 +32,22 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackag
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getFunctionalAnalysisArchitecture <em>Functional Analysis Architecture</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.AnalysisLevelImpl#getFunctionalAnalysisArchitecture <em>Functional Analysis
+ * Architecture</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -55,6 +58,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -65,6 +69,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	 * The cached value of the '{@link #getFunctionalAnalysisArchitecture() <em>Functional Analysis Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionalAnalysisArchitecture()
 	 * @generated
 	 * @ordered
@@ -74,6 +79,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnalysisLevelImpl() {
@@ -83,6 +89,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisFunctionPrototype basicGetFunctionalAnalysisArchitecture() {
@@ -92,20 +99,24 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
-				if (resolve) return getFunctionalAnalysisArchitecture();
-				return basicGetFunctionalAnalysisArchitecture();
+		switch(featureID) {
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
+			if(resolve)
+				return getFunctionalAnalysisArchitecture();
+			return basicGetFunctionalAnalysisArchitecture();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -113,17 +124,18 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
-				return base_Class != null;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
-				return base_Package != null;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
-				return functionalAnalysisArchitecture != null;
+		switch(featureID) {
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
+			return base_Class != null;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
+			return base_Package != null;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
+			return functionalAnalysisArchitecture != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -131,20 +143,21 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
-				setFunctionalAnalysisArchitecture((AnalysisFunctionPrototype)newValue);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
+			setFunctionalAnalysisArchitecture((AnalysisFunctionPrototype)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -152,6 +165,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,14 +176,15 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -179,6 +194,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -188,26 +204,28 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -217,6 +235,7 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -226,32 +245,34 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
-				setFunctionalAnalysisArchitecture((AnalysisFunctionPrototype)null);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE:
+			setFunctionalAnalysisArchitecture((AnalysisFunctionPrototype)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -259,14 +280,15 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisFunctionPrototype getFunctionalAnalysisArchitecture() {
-		if (functionalAnalysisArchitecture != null && functionalAnalysisArchitecture.eIsProxy()) {
+		if(functionalAnalysisArchitecture != null && functionalAnalysisArchitecture.eIsProxy()) {
 			InternalEObject oldFunctionalAnalysisArchitecture = (InternalEObject)functionalAnalysisArchitecture;
 			functionalAnalysisArchitecture = (AnalysisFunctionPrototype)eResolveProxy(oldFunctionalAnalysisArchitecture);
-			if (functionalAnalysisArchitecture != oldFunctionalAnalysisArchitecture) {
-				if (eNotificationRequired())
+			if(functionalAnalysisArchitecture != oldFunctionalAnalysisArchitecture) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE, oldFunctionalAnalysisArchitecture, functionalAnalysisArchitecture));
 			}
 		}
@@ -276,12 +298,13 @@ public class AnalysisLevelImpl extends ContextImpl implements AnalysisLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunctionalAnalysisArchitecture(AnalysisFunctionPrototype newFunctionalAnalysisArchitecture) {
 		AnalysisFunctionPrototype oldFunctionalAnalysisArchitecture = functionalAnalysisArchitecture;
 		functionalAnalysisArchitecture = newFunctionalAnalysisArchitecture;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.ANALYSIS_LEVEL__FUNCTIONAL_ANALYSIS_ARCHITECTURE, oldFunctionalAnalysisArchitecture, functionalAnalysisArchitecture));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/DesignLevelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/DesignLevelImpl.java
index 9f53974c7b5..ca3bb192610 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/DesignLevelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/DesignLevelImpl.java
@@ -38,21 +38,25 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackag
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getFunctionalDesignArchitecture <em>Functional Design Architecture</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getHardwareDesignArchitecture <em>Hardware Design Architecture</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getAllocation <em>Allocation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getFunctionalDesignArchitecture <em>Functional Design
+ * Architecture</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getHardwareDesignArchitecture <em>Hardware Design Architecture
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.DesignLevelImpl#getAllocation <em>Allocation</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DesignLevelImpl extends ContextImpl implements DesignLevel {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -63,6 +67,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -73,6 +78,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	 * The cached value of the '{@link #getFunctionalDesignArchitecture() <em>Functional Design Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionalDesignArchitecture()
 	 * @generated
 	 * @ordered
@@ -83,6 +89,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	 * The cached value of the '{@link #getHardwareDesignArchitecture() <em>Hardware Design Architecture</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getHardwareDesignArchitecture()
 	 * @generated
 	 * @ordered
@@ -93,6 +100,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	 * The cached value of the '{@link #getAllocation() <em>Allocation</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAllocation()
 	 * @generated
 	 * @ordered
@@ -102,6 +110,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DesignLevelImpl() {
@@ -111,6 +120,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionPrototype basicGetFunctionalDesignArchitecture() {
@@ -120,6 +130,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentPrototype basicGetHardwareDesignArchitecture() {
@@ -129,25 +140,30 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
-				if (resolve) return getFunctionalDesignArchitecture();
-				return basicGetFunctionalDesignArchitecture();
-			case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
-				if (resolve) return getHardwareDesignArchitecture();
-				return basicGetHardwareDesignArchitecture();
-			case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
-				return getAllocation();
+		switch(featureID) {
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
+			if(resolve)
+				return getFunctionalDesignArchitecture();
+			return basicGetFunctionalDesignArchitecture();
+		case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
+			if(resolve)
+				return getHardwareDesignArchitecture();
+			return basicGetHardwareDesignArchitecture();
+		case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
+			return getAllocation();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -155,21 +171,22 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
-				return base_Class != null;
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
-				return base_Package != null;
-			case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
-				return functionalDesignArchitecture != null;
-			case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
-				return hardwareDesignArchitecture != null;
-			case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
-				return allocation != null && !allocation.isEmpty();
+		switch(featureID) {
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
+			return base_Class != null;
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
+			return base_Package != null;
+		case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
+			return functionalDesignArchitecture != null;
+		case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
+			return hardwareDesignArchitecture != null;
+		case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
+			return allocation != null && !allocation.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -177,28 +194,29 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
-				setFunctionalDesignArchitecture((DesignFunctionPrototype)newValue);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
-				setHardwareDesignArchitecture((HardwareComponentPrototype)newValue);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
-				getAllocation().clear();
-				getAllocation().addAll((Collection<? extends Allocation>)newValue);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
+			setFunctionalDesignArchitecture((DesignFunctionPrototype)newValue);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
+			setHardwareDesignArchitecture((HardwareComponentPrototype)newValue);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
+			getAllocation().clear();
+			getAllocation().addAll((Collection<? extends Allocation>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -206,6 +224,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,14 +235,15 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -233,6 +253,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -242,26 +263,28 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -271,6 +294,7 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -280,38 +304,40 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
-				setFunctionalDesignArchitecture((DesignFunctionPrototype)null);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
-				setHardwareDesignArchitecture((HardwareComponentPrototype)null);
-				return;
-			case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
-				getAllocation().clear();
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE:
+			setFunctionalDesignArchitecture((DesignFunctionPrototype)null);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE:
+			setHardwareDesignArchitecture((HardwareComponentPrototype)null);
+			return;
+		case SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION:
+			getAllocation().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -319,10 +345,11 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Allocation> getAllocation() {
-		if (allocation == null) {
+		if(allocation == null) {
 			allocation = new EObjectResolvingEList<Allocation>(Allocation.class, this, SystemmodelingPackage.DESIGN_LEVEL__ALLOCATION);
 		}
 		return allocation;
@@ -331,14 +358,15 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionPrototype getFunctionalDesignArchitecture() {
-		if (functionalDesignArchitecture != null && functionalDesignArchitecture.eIsProxy()) {
+		if(functionalDesignArchitecture != null && functionalDesignArchitecture.eIsProxy()) {
 			InternalEObject oldFunctionalDesignArchitecture = (InternalEObject)functionalDesignArchitecture;
 			functionalDesignArchitecture = (DesignFunctionPrototype)eResolveProxy(oldFunctionalDesignArchitecture);
-			if (functionalDesignArchitecture != oldFunctionalDesignArchitecture) {
-				if (eNotificationRequired())
+			if(functionalDesignArchitecture != oldFunctionalDesignArchitecture) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE, oldFunctionalDesignArchitecture, functionalDesignArchitecture));
 			}
 		}
@@ -348,14 +376,15 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HardwareComponentPrototype getHardwareDesignArchitecture() {
-		if (hardwareDesignArchitecture != null && hardwareDesignArchitecture.eIsProxy()) {
+		if(hardwareDesignArchitecture != null && hardwareDesignArchitecture.eIsProxy()) {
 			InternalEObject oldHardwareDesignArchitecture = (InternalEObject)hardwareDesignArchitecture;
 			hardwareDesignArchitecture = (HardwareComponentPrototype)eResolveProxy(oldHardwareDesignArchitecture);
-			if (hardwareDesignArchitecture != oldHardwareDesignArchitecture) {
-				if (eNotificationRequired())
+			if(hardwareDesignArchitecture != oldHardwareDesignArchitecture) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE, oldHardwareDesignArchitecture, hardwareDesignArchitecture));
 			}
 		}
@@ -365,24 +394,26 @@ public class DesignLevelImpl extends ContextImpl implements DesignLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunctionalDesignArchitecture(DesignFunctionPrototype newFunctionalDesignArchitecture) {
 		DesignFunctionPrototype oldFunctionalDesignArchitecture = functionalDesignArchitecture;
 		functionalDesignArchitecture = newFunctionalDesignArchitecture;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.DESIGN_LEVEL__FUNCTIONAL_DESIGN_ARCHITECTURE, oldFunctionalDesignArchitecture, functionalDesignArchitecture));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHardwareDesignArchitecture(HardwareComponentPrototype newHardwareDesignArchitecture) {
 		HardwareComponentPrototype oldHardwareDesignArchitecture = hardwareDesignArchitecture;
 		hardwareDesignArchitecture = newHardwareDesignArchitecture;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.DESIGN_LEVEL__HARDWARE_DESIGN_ARCHITECTURE, oldHardwareDesignArchitecture, hardwareDesignArchitecture));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/ImplementationLevelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/ImplementationLevelImpl.java
index e36f85b3cd1..67cca87edab 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/ImplementationLevelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/ImplementationLevelImpl.java
@@ -32,19 +32,21 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getAutosarSystem <em>Autosar System</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getAutosarSystem <em>Autosar System</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.ImplementationLevelImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImplementationLevelImpl extends ContextImpl implements ImplementationLevel {
+
 	/**
 	 * The cached value of the '{@link #getAutosarSystem() <em>Autosar System</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAutosarSystem()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -65,6 +68,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -74,6 +78,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImplementationLevelImpl() {
@@ -83,6 +88,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetAutosarSystem() {
@@ -92,20 +98,24 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
-				if (resolve) return getAutosarSystem();
-				return basicGetAutosarSystem();
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
+			if(resolve)
+				return getAutosarSystem();
+			return basicGetAutosarSystem();
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -113,17 +123,18 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
-				return autosarSystem != null;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
-				return base_Class != null;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
+			return autosarSystem != null;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
+			return base_Class != null;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -131,20 +142,21 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
-				setAutosarSystem((NamedElement)newValue);
-				return;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
+			setAutosarSystem((NamedElement)newValue);
+			return;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -152,6 +164,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,20 +175,21 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
-				setAutosarSystem((NamedElement)null);
-				return;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM:
+			setAutosarSystem((NamedElement)null);
+			return;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -183,14 +197,15 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getAutosarSystem() {
-		if (autosarSystem != null && autosarSystem.eIsProxy()) {
+		if(autosarSystem != null && autosarSystem.eIsProxy()) {
 			InternalEObject oldAutosarSystem = (InternalEObject)autosarSystem;
 			autosarSystem = (NamedElement)eResolveProxy(oldAutosarSystem);
-			if (autosarSystem != oldAutosarSystem) {
-				if (eNotificationRequired())
+			if(autosarSystem != oldAutosarSystem) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM, oldAutosarSystem, autosarSystem));
 			}
 		}
@@ -200,26 +215,28 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAutosarSystem(NamedElement newAutosarSystem) {
 		NamedElement oldAutosarSystem = autosarSystem;
 		autosarSystem = newAutosarSystem;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.IMPLEMENTATION_LEVEL__AUTOSAR_SYSTEM, oldAutosarSystem, autosarSystem));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -229,6 +246,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -238,26 +256,28 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -267,6 +287,7 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -276,12 +297,13 @@ public class ImplementationLevelImpl extends ContextImpl implements Implementati
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.IMPLEMENTATION_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemModelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemModelImpl.java
index bf3c18883a0..1bd54020f0c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemModelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemModelImpl.java
@@ -35,22 +35,24 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getImplementationLevel <em>Implementation Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getAnalysisLevel <em>Analysis Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getDesignLevel <em>Design Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getVehicleLevel <em>Vehicle Level</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getImplementationLevel <em>Implementation Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getAnalysisLevel <em>Analysis Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getDesignLevel <em>Design Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getVehicleLevel <em>Vehicle Level</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.SystemModelImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SystemModelImpl extends ContextImpl implements SystemModel {
+
 	/**
 	 * The cached value of the '{@link #getImplementationLevel() <em>Implementation Level</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getImplementationLevel()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	 * The cached value of the '{@link #getAnalysisLevel() <em>Analysis Level</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAnalysisLevel()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	 * The cached value of the '{@link #getDesignLevel() <em>Design Level</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDesignLevel()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	 * The cached value of the '{@link #getVehicleLevel() <em>Vehicle Level</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVehicleLevel()
 	 * @generated
 	 * @ordered
@@ -91,6 +96,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -101,6 +107,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -110,6 +117,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SystemModelImpl() {
@@ -119,6 +127,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisLevel basicGetAnalysisLevel() {
@@ -128,6 +137,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignLevel basicGetDesignLevel() {
@@ -137,6 +147,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImplementationLevel basicGetImplementationLevel() {
@@ -146,6 +157,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VehicleLevel basicGetVehicleLevel() {
@@ -155,29 +167,36 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
-				if (resolve) return getImplementationLevel();
-				return basicGetImplementationLevel();
-			case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
-				if (resolve) return getAnalysisLevel();
-				return basicGetAnalysisLevel();
-			case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
-				if (resolve) return getDesignLevel();
-				return basicGetDesignLevel();
-			case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
-				if (resolve) return getVehicleLevel();
-				return basicGetVehicleLevel();
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
+			if(resolve)
+				return getImplementationLevel();
+			return basicGetImplementationLevel();
+		case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
+			if(resolve)
+				return getAnalysisLevel();
+			return basicGetAnalysisLevel();
+		case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
+			if(resolve)
+				return getDesignLevel();
+			return basicGetDesignLevel();
+		case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
+			if(resolve)
+				return getVehicleLevel();
+			return basicGetVehicleLevel();
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -185,23 +204,24 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
-				return implementationLevel != null;
-			case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
-				return analysisLevel != null;
-			case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
-				return designLevel != null;
-			case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
-				return vehicleLevel != null;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
-				return base_Class != null;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
+			return implementationLevel != null;
+		case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
+			return analysisLevel != null;
+		case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
+			return designLevel != null;
+		case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
+			return vehicleLevel != null;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
+			return base_Class != null;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -209,29 +229,30 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
-				setImplementationLevel((ImplementationLevel)newValue);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
-				setAnalysisLevel((AnalysisLevel)newValue);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
-				setDesignLevel((DesignLevel)newValue);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
-				setVehicleLevel((VehicleLevel)newValue);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
+			setImplementationLevel((ImplementationLevel)newValue);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
+			setAnalysisLevel((AnalysisLevel)newValue);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
+			setDesignLevel((DesignLevel)newValue);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
+			setVehicleLevel((VehicleLevel)newValue);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -239,6 +260,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -249,29 +271,30 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
-				setImplementationLevel((ImplementationLevel)null);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
-				setAnalysisLevel((AnalysisLevel)null);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
-				setDesignLevel((DesignLevel)null);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
-				setVehicleLevel((VehicleLevel)null);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL:
+			setImplementationLevel((ImplementationLevel)null);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL:
+			setAnalysisLevel((AnalysisLevel)null);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL:
+			setDesignLevel((DesignLevel)null);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL:
+			setVehicleLevel((VehicleLevel)null);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -279,14 +302,15 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisLevel getAnalysisLevel() {
-		if (analysisLevel != null && analysisLevel.eIsProxy()) {
+		if(analysisLevel != null && analysisLevel.eIsProxy()) {
 			InternalEObject oldAnalysisLevel = (InternalEObject)analysisLevel;
 			analysisLevel = (AnalysisLevel)eResolveProxy(oldAnalysisLevel);
-			if (analysisLevel != oldAnalysisLevel) {
-				if (eNotificationRequired())
+			if(analysisLevel != oldAnalysisLevel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL, oldAnalysisLevel, analysisLevel));
 			}
 		}
@@ -296,14 +320,15 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignLevel getDesignLevel() {
-		if (designLevel != null && designLevel.eIsProxy()) {
+		if(designLevel != null && designLevel.eIsProxy()) {
 			InternalEObject oldDesignLevel = (InternalEObject)designLevel;
 			designLevel = (DesignLevel)eResolveProxy(oldDesignLevel);
-			if (designLevel != oldDesignLevel) {
-				if (eNotificationRequired())
+			if(designLevel != oldDesignLevel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL, oldDesignLevel, designLevel));
 			}
 		}
@@ -313,14 +338,15 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImplementationLevel getImplementationLevel() {
-		if (implementationLevel != null && implementationLevel.eIsProxy()) {
+		if(implementationLevel != null && implementationLevel.eIsProxy()) {
 			InternalEObject oldImplementationLevel = (InternalEObject)implementationLevel;
 			implementationLevel = (ImplementationLevel)eResolveProxy(oldImplementationLevel);
-			if (implementationLevel != oldImplementationLevel) {
-				if (eNotificationRequired())
+			if(implementationLevel != oldImplementationLevel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL, oldImplementationLevel, implementationLevel));
 			}
 		}
@@ -330,14 +356,15 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VehicleLevel getVehicleLevel() {
-		if (vehicleLevel != null && vehicleLevel.eIsProxy()) {
+		if(vehicleLevel != null && vehicleLevel.eIsProxy()) {
 			InternalEObject oldVehicleLevel = (InternalEObject)vehicleLevel;
 			vehicleLevel = (VehicleLevel)eResolveProxy(oldVehicleLevel);
-			if (vehicleLevel != oldVehicleLevel) {
-				if (eNotificationRequired())
+			if(vehicleLevel != oldVehicleLevel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL, oldVehicleLevel, vehicleLevel));
 			}
 		}
@@ -347,62 +374,67 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAnalysisLevel(AnalysisLevel newAnalysisLevel) {
 		AnalysisLevel oldAnalysisLevel = analysisLevel;
 		analysisLevel = newAnalysisLevel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__ANALYSIS_LEVEL, oldAnalysisLevel, analysisLevel));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDesignLevel(DesignLevel newDesignLevel) {
 		DesignLevel oldDesignLevel = designLevel;
 		designLevel = newDesignLevel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__DESIGN_LEVEL, oldDesignLevel, designLevel));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImplementationLevel(ImplementationLevel newImplementationLevel) {
 		ImplementationLevel oldImplementationLevel = implementationLevel;
 		implementationLevel = newImplementationLevel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__IMPLEMENTATION_LEVEL, oldImplementationLevel, implementationLevel));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setVehicleLevel(VehicleLevel newVehicleLevel) {
 		VehicleLevel oldVehicleLevel = vehicleLevel;
 		vehicleLevel = newVehicleLevel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__VEHICLE_LEVEL, oldVehicleLevel, vehicleLevel));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -412,6 +444,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -421,26 +454,28 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -450,6 +485,7 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -459,12 +495,13 @@ public class SystemModelImpl extends ContextImpl implements SystemModel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.SYSTEM_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingFactoryImpl.java
index 915cdab5098..2bc900f1351 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.structure.systemmodeling.*;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel;
@@ -33,12 +34,15 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SystemmodelingFactoryImpl extends EFactoryImpl implements SystemmodelingFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -51,16 +55,16 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static SystemmodelingFactory init() {
 		try {
 			SystemmodelingFactory theSystemmodelingFactory = (SystemmodelingFactory)EPackage.Registry.INSTANCE.getEFactory(SystemmodelingPackage.eNS_URI);
-			if (theSystemmodelingFactory != null) {
+			if(theSystemmodelingFactory != null) {
 				return theSystemmodelingFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new SystemmodelingFactoryImpl();
@@ -70,6 +74,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingFactoryImpl() {
@@ -79,24 +84,31 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SystemmodelingPackage.SYSTEM_MODEL: return createSystemModel();
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL: return createImplementationLevel();
-			case SystemmodelingPackage.ANALYSIS_LEVEL: return createAnalysisLevel();
-			case SystemmodelingPackage.DESIGN_LEVEL: return createDesignLevel();
-			case SystemmodelingPackage.VEHICLE_LEVEL: return createVehicleLevel();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case SystemmodelingPackage.SYSTEM_MODEL:
+			return createSystemModel();
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL:
+			return createImplementationLevel();
+		case SystemmodelingPackage.ANALYSIS_LEVEL:
+			return createAnalysisLevel();
+		case SystemmodelingPackage.DESIGN_LEVEL:
+			return createDesignLevel();
+		case SystemmodelingPackage.VEHICLE_LEVEL:
+			return createVehicleLevel();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnalysisLevel createAnalysisLevel() {
@@ -107,6 +119,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignLevel createDesignLevel() {
@@ -117,6 +130,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImplementationLevel createImplementationLevel() {
@@ -127,6 +141,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemModel createSystemModel() {
@@ -137,6 +152,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VehicleLevel createVehicleLevel() {
@@ -147,6 +163,7 @@ public class SystemmodelingFactoryImpl extends EFactoryImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingPackage getSystemmodelingPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingPackageImpl.java
index 7322966eafa..765c14830b0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/SystemmodelingPackageImpl.java
@@ -88,6 +88,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SystemmodelingPackageImpl extends EPackageImpl implements SystemmodelingPackage {
@@ -95,6 +96,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass systemModelEClass = null;
@@ -102,6 +104,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass implementationLevelEClass = null;
@@ -109,6 +112,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass analysisLevelEClass = null;
@@ -116,6 +120,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass designLevelEClass = null;
@@ -123,6 +128,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass vehicleLevelEClass = null;
@@ -130,6 +136,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -137,16 +144,18 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * 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 SystemmodelingPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link SystemmodelingPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static SystemmodelingPackage init() {
-		if (isInited) return (SystemmodelingPackage)EPackage.Registry.INSTANCE.getEPackage(SystemmodelingPackage.eNS_URI);
+		if(isInited)
+			return (SystemmodelingPackage)EPackage.Registry.INSTANCE.getEPackage(SystemmodelingPackage.eNS_URI);
 
 		// Obtain or create and register package
 		SystemmodelingPackageImpl theSystemmodelingPackage = (SystemmodelingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SystemmodelingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SystemmodelingPackageImpl());
@@ -248,7 +257,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 		// Mark meta-data to indicate it can't be changed
 		theSystemmodelingPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(SystemmodelingPackage.eNS_URI, theSystemmodelingPackage);
 		return theSystemmodelingPackage;
@@ -257,6 +266,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -264,19 +274,19 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage#eNS_URI
 	 * @see #init()
@@ -287,14 +297,16 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -332,6 +344,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAnalysisLevel() {
@@ -341,6 +354,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnalysisLevel_Base_Class() {
@@ -350,6 +364,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnalysisLevel_Base_Package() {
@@ -359,6 +374,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnalysisLevel_FunctionalAnalysisArchitecture() {
@@ -368,6 +384,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDesignLevel() {
@@ -377,6 +394,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDesignLevel_Base_Class() {
@@ -386,6 +404,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDesignLevel_Base_Package() {
@@ -395,6 +414,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDesignLevel_Allocation() {
@@ -404,6 +424,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDesignLevel_FunctionalDesignArchitecture() {
@@ -413,6 +434,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDesignLevel_HardwareDesignArchitecture() {
@@ -422,6 +444,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImplementationLevel() {
@@ -431,6 +454,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImplementationLevel_AutosarSystem() {
@@ -440,6 +464,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImplementationLevel_Base_Class() {
@@ -449,6 +474,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImplementationLevel_Base_Package() {
@@ -458,6 +484,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSystemModel() {
@@ -467,6 +494,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_AnalysisLevel() {
@@ -476,6 +504,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_DesignLevel() {
@@ -485,6 +514,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_ImplementationLevel() {
@@ -494,6 +524,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_VehicleLevel() {
@@ -503,6 +534,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_Base_Class() {
@@ -512,6 +544,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSystemModel_Base_Package() {
@@ -521,6 +554,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingFactory getSystemmodelingFactory() {
@@ -530,6 +564,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getVehicleLevel() {
@@ -539,6 +574,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleLevel_Base_Package() {
@@ -548,6 +584,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleLevel_Base_Class() {
@@ -557,6 +594,7 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getVehicleLevel_TechnicalFeatureModel() {
@@ -564,14 +602,16 @@ public class SystemmodelingPackageImpl extends EPackageImpl implements Systemmod
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/VehicleLevelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/VehicleLevelImpl.java
index 82383982eee..515bb35b054 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/VehicleLevelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/impl/VehicleLevelImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getTechnicalFeatureModel <em>Technical Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.impl.VehicleLevelImpl#getTechnicalFeatureModel <em>Technical Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
+
 	/**
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	 * The cached value of the '{@link #getTechnicalFeatureModel() <em>Technical Feature Model</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTechnicalFeatureModel()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VehicleLevelImpl() {
@@ -87,19 +92,22 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
-				return getTechnicalFeatureModel();
+		switch(featureID) {
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
+			return getTechnicalFeatureModel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +115,18 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
-				return base_Package != null;
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
-				return base_Class != null;
-			case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
-				return technicalFeatureModel != null && !technicalFeatureModel.isEmpty();
+		switch(featureID) {
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
+			return base_Package != null;
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
+			return base_Class != null;
+		case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
+			return technicalFeatureModel != null && !technicalFeatureModel.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,22 +134,23 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
-				getTechnicalFeatureModel().clear();
-				getTechnicalFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
+			getTechnicalFeatureModel().clear();
+			getTechnicalFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,14 +169,15 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -175,6 +187,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -184,26 +197,28 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -213,6 +228,7 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -222,32 +238,34 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
-				getTechnicalFeatureModel().clear();
-				return;
+		switch(featureID) {
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case SystemmodelingPackage.VEHICLE_LEVEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL:
+			getTechnicalFeatureModel().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,10 +273,11 @@ public class VehicleLevelImpl extends ContextImpl implements VehicleLevel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FeatureModel> getTechnicalFeatureModel() {
-		if (technicalFeatureModel == null) {
+		if(technicalFeatureModel == null) {
 			technicalFeatureModel = new EObjectResolvingEList<FeatureModel>(FeatureModel.class, this, SystemmodelingPackage.VEHICLE_LEVEL__TECHNICAL_FEATURE_MODEL);
 		}
 		return technicalFeatureModel;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingAdapterFactory.java
index b6edcc81a42..7bf1ec6db72 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.structure.systemmodeling.*;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel;
@@ -34,14 +35,17 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage
  * @generated
  */
 public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SystemmodelingPackage modelPackage;
@@ -50,52 +54,61 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected SystemmodelingSwitch<Adapter> modelSwitch =
-		new SystemmodelingSwitch<Adapter>() {
-			@Override
-			public Adapter caseSystemModel(SystemModel object) {
-				return createSystemModelAdapter();
-			}
-			@Override
-			public Adapter caseImplementationLevel(ImplementationLevel object) {
-				return createImplementationLevelAdapter();
-			}
-			@Override
-			public Adapter caseAnalysisLevel(AnalysisLevel object) {
-				return createAnalysisLevelAdapter();
-			}
-			@Override
-			public Adapter caseDesignLevel(DesignLevel object) {
-				return createDesignLevelAdapter();
-			}
-			@Override
-			public Adapter caseVehicleLevel(VehicleLevel object) {
-				return createVehicleLevelAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected SystemmodelingSwitch<Adapter> modelSwitch = new SystemmodelingSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseSystemModel(SystemModel object) {
+			return createSystemModelAdapter();
+		}
+
+		@Override
+		public Adapter caseImplementationLevel(ImplementationLevel object) {
+			return createImplementationLevelAdapter();
+		}
+
+		@Override
+		public Adapter caseAnalysisLevel(AnalysisLevel object) {
+			return createAnalysisLevelAdapter();
+		}
+
+		@Override
+		public Adapter caseDesignLevel(DesignLevel object) {
+			return createDesignLevelAdapter();
+		}
+
+		@Override
+		public Adapter caseVehicleLevel(VehicleLevel object) {
+			return createVehicleLevelAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SystemmodelingPackage.eINSTANCE;
 		}
 	}
@@ -104,7 +117,9 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -114,11 +129,13 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel <em>Analysis Level</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel
+	 * <em>Analysis Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel
 	 * @generated
@@ -134,6 +151,7 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -148,6 +166,7 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel
 	 * @generated
@@ -161,6 +180,7 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -169,11 +189,13 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel <em>Implementation Level</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel
+	 * <em>Implementation Level</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel
 	 * @generated
@@ -188,6 +210,7 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemModel
 	 * @generated
@@ -197,11 +220,13 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel <em>Vehicle Level</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel <em>Vehicle Level</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel
 	 * @generated
@@ -216,6 +241,7 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -229,15 +255,16 @@ public class SystemmodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceFactoryImpl.java
index ac0f0cea31e..7df12f8d1ac 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.util.SystemmodelingResourceImpl
  * @generated
  */
 public class SystemmodelingResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class SystemmodelingResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceImpl.java
index ca7a6081786..f76bc4b7cd3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.util.SystemmodelingResourceFactoryImpl
  * @generated
  */
 public class SystemmodelingResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public SystemmodelingResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingSwitch.java
index bba1cd7ad8e..44d0c3009be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.structure.systemmodeling.*;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.AnalysisLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.DesignLevel;
 import org.eclipse.papyrus.eastadl.structure.systemmodeling.ImplementationLevel;
@@ -31,21 +32,23 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.VehicleLevel;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackage
  * @generated
  */
 public class SystemmodelingSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static SystemmodelingPackage modelPackage;
@@ -54,10 +57,11 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = SystemmodelingPackage.eINSTANCE;
 		}
 	}
@@ -66,6 +70,7 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -81,7 +86,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Analysis Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -96,7 +103,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -111,7 +120,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Design Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -126,7 +137,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Implementation Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -141,7 +154,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>System Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -156,7 +171,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Vehicle Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -171,7 +188,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -186,7 +205,9 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -200,53 +221,75 @@ public class SystemmodelingSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SystemmodelingPackage.SYSTEM_MODEL: {
-				SystemModel systemModel = (SystemModel)theEObject;
-				T result = caseSystemModel(systemModel);
-				if (result == null) result = caseContext(systemModel);
-				if (result == null) result = caseEAElement(systemModel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SystemmodelingPackage.IMPLEMENTATION_LEVEL: {
-				ImplementationLevel implementationLevel = (ImplementationLevel)theEObject;
-				T result = caseImplementationLevel(implementationLevel);
-				if (result == null) result = caseContext(implementationLevel);
-				if (result == null) result = caseEAElement(implementationLevel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SystemmodelingPackage.ANALYSIS_LEVEL: {
-				AnalysisLevel analysisLevel = (AnalysisLevel)theEObject;
-				T result = caseAnalysisLevel(analysisLevel);
-				if (result == null) result = caseContext(analysisLevel);
-				if (result == null) result = caseEAElement(analysisLevel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SystemmodelingPackage.DESIGN_LEVEL: {
-				DesignLevel designLevel = (DesignLevel)theEObject;
-				T result = caseDesignLevel(designLevel);
-				if (result == null) result = caseContext(designLevel);
-				if (result == null) result = caseEAElement(designLevel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SystemmodelingPackage.VEHICLE_LEVEL: {
-				VehicleLevel vehicleLevel = (VehicleLevel)theEObject;
-				T result = caseVehicleLevel(vehicleLevel);
-				if (result == null) result = caseContext(vehicleLevel);
-				if (result == null) result = caseEAElement(vehicleLevel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case SystemmodelingPackage.SYSTEM_MODEL:
+		{
+			SystemModel systemModel = (SystemModel)theEObject;
+			T result = caseSystemModel(systemModel);
+			if(result == null)
+				result = caseContext(systemModel);
+			if(result == null)
+				result = caseEAElement(systemModel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SystemmodelingPackage.IMPLEMENTATION_LEVEL:
+		{
+			ImplementationLevel implementationLevel = (ImplementationLevel)theEObject;
+			T result = caseImplementationLevel(implementationLevel);
+			if(result == null)
+				result = caseContext(implementationLevel);
+			if(result == null)
+				result = caseEAElement(implementationLevel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SystemmodelingPackage.ANALYSIS_LEVEL:
+		{
+			AnalysisLevel analysisLevel = (AnalysisLevel)theEObject;
+			T result = caseAnalysisLevel(analysisLevel);
+			if(result == null)
+				result = caseContext(analysisLevel);
+			if(result == null)
+				result = caseEAElement(analysisLevel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SystemmodelingPackage.DESIGN_LEVEL:
+		{
+			DesignLevel designLevel = (DesignLevel)theEObject;
+			T result = caseDesignLevel(designLevel);
+			if(result == null)
+				result = caseContext(designLevel);
+			if(result == null)
+				result = caseEAElement(designLevel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case SystemmodelingPackage.VEHICLE_LEVEL:
+		{
+			VehicleLevel vehicleLevel = (VehicleLevel)theEObject;
+			T result = caseVehicleLevel(vehicleLevel);
+			if(result == null)
+				result = caseContext(vehicleLevel);
+			if(result == null)
+				result = caseEAElement(vehicleLevel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingXMLProcessor.java
index b8ed12cf4f7..6c342a957f0 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/systemmodeling/util/SystemmodelingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.systemmodeling.SystemmodelingPackag
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class SystemmodelingXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class SystemmodelingXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SystemmodelingXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		SystemmodelingPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the SystemmodelingResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new SystemmodelingResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new SystemmodelingResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceFactoryImpl.java
index 8d0a3d37c63..0967b19ee43 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceFactoryImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.util.StructureResourceImpl

  * @generated

  */

@@ -30,6 +31,7 @@ public class StructureResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StructureResourceFactoryImpl() {

@@ -39,6 +41,7 @@ public class StructureResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceImpl.java
index 554c46a311b..459521204c5 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.util.StructureResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class StructureResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public StructureResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureXMLProcessor.java
index ddf99ab8ab0..9059614d3da 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/util/StructureXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.StructurePackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class StructureXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class StructureXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StructureXMLProcessor() {

@@ -49,7 +51,7 @@ public class StructureXMLProcessor extends XMLProcessor {
 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new StructureResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new StructureResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationAttributeSet.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationAttributeSet.java
index 061eec7a7e3..b36eb00be42 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationAttributeSet.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationAttributeSet.java
@@ -21,33 +21,37 @@ import org.eclipse.uml2.uml.DataType;
 

 

 /**

- * <!-- begin-user-doc --> A representation of the model object '

- * <em><b>Deviation Attribute Set</b></em>'. <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Deviation Attribute Set</b></em>'. <!-- end-user-doc -->

+ * 

  * <!-- begin-model-doc -->

- * DeviationAttributeSet specifies the set of rules of allowed deviations from the reference model in a referring model. These rules are important, because they make sure that the different FeatureModels, referring to one reference model, follow specific rules for deviation, so a later integration into one FeatureModel might be possible.

+ * DeviationAttributeSet specifies the set of rules of allowed deviations from the reference model in a referring model. These rules are important,

+ * because they make sure that the different FeatureModels, referring to one reference model, follow specific rules for deviation, so a later

+ * integration into one FeatureModel might be possible.

  * 

  * Extension:

  * DataType

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute <em>Allow Change Attribute</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality <em>Allow Change Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription <em>Allow Change Description</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName <em>Allow Change Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove <em>Allow Move</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction <em>Allow Reduction</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement <em>Allow Refinement</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping <em>Allow Regrouping</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval <em>Allow Removal</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType <em>Base Data Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute <em>Allow Change Attribute

+ * </em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality <em>Allow Change

+ * Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription <em>Allow Change

+ * Description</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName <em>Allow Change Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove <em>Allow Move</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction <em>Allow Reduction</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement <em>Allow Refinement</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping <em>Allow Regrouping</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval <em>Allow Removal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType <em>Base Data Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet()

  * @model

  * @generated

@@ -56,183 +60,181 @@ public interface DeviationAttributeSet extends EAElement {
 

 	/**

 	 * Returns the value of the '<em><b>Allow Change Attribute</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Change Attribute</em>' attribute isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Allow Change Attribute</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Change Attribute</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowChangeAttribute(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowChangeAttribute()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowChangeAttribute();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Change Cardinality</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Change Cardinality</em>' attribute isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Allow Change Cardinality</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Change Cardinality</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowChangeCardinality(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowChangeCardinality()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowChangeCardinality();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Change Description</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Change Description</em>' attribute isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Allow Change Description</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Change Description</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowChangeDescription(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowChangeDescription()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowChangeDescription();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Change Name</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Change Name</em>' attribute isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Allow Change Name</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Change Name</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowChangeName(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowChangeName()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowChangeName();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Move</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Move</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Allow Move</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Move</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowMove(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowMove()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowMove();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Reduction</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Reduction</em>' attribute isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Allow Reduction</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Reduction</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowReduction(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowReduction()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowReduction();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Refinement</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Refinement</em>' attribute isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Allow Refinement</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Refinement</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowRefinement(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowRefinement()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowRefinement();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Regrouping</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Regrouping</em>' attribute isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Allow Regrouping</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Regrouping</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowRegrouping(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowRegrouping()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowRegrouping();

 

 	/**

 	 * Returns the value of the '<em><b>Allow Removal</b></em>' attribute.

-	 * The default value is <code>"YES"</code>.

+	 * The default value is <code>"yes"</code>.

 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Allow Removal</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Allow Removal</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Allow Removal</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #setAllowRemoval(DeviationPermissionKind)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_AllowRemoval()

-	 * @model default="YES" required="true" ordered="false"

+	 * @model default="yes" required="true" ordered="false"

 	 * @generated

 	 */

 	DeviationPermissionKind getAllowRemoval();

 

 	/**

 	 * Returns the value of the '<em><b>Feature</b></em>' container reference. It is bidirectional

-	 * and its opposite is '

-	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet

+	 * and its opposite is ' {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet

 	 * <em>Deviation Attribute Set</em>}'. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature</em>' container reference isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of the '<em>Feature</em>' container reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation attributes belong to vehicle

 	 * features that are part of a reference feature model in the context of multi-level feature

@@ -249,9 +251,12 @@ public interface DeviationAttributeSet extends EAElement {
 	VehicleFeature getFeature();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute <em>Allow Change Attribute</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute

+	 * <em>Allow Change Attribute</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Change Attribute</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Change Attribute</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowChangeAttribute()

 	 * @generated

@@ -259,9 +264,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowChangeAttribute(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality <em>Allow Change Cardinality</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality

+	 * <em>Allow Change Cardinality</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Change Cardinality</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Change Cardinality</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowChangeCardinality()

 	 * @generated

@@ -269,10 +277,13 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowChangeCardinality(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription <em>Allow Change Description</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription

+	 * <em>Allow Change Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Change Description</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Change Description</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowChangeDescription()

 	 * @generated

@@ -280,9 +291,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowChangeDescription(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName <em>Allow Change Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName

+	 * <em>Allow Change Name</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Change Name</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Change Name</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowChangeName()

 	 * @generated

@@ -290,9 +304,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowChangeName(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove <em>Allow Move</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove

+	 * <em>Allow Move</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Move</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Move</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowMove()

 	 * @generated

@@ -300,9 +317,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowMove(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction <em>Allow Reduction</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction

+	 * <em>Allow Reduction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Reduction</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Reduction</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowReduction()

 	 * @generated

@@ -310,9 +330,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowReduction(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement <em>Allow Refinement</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement

+	 * <em>Allow Refinement</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Refinement</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Refinement</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowRefinement()

 	 * @generated

@@ -320,9 +343,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowRefinement(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping <em>Allow Regrouping</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping

+	 * <em>Allow Regrouping</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Regrouping</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Regrouping</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowRegrouping()

 	 * @generated

@@ -330,9 +356,12 @@ public interface DeviationAttributeSet extends EAElement {
 	void setAllowRegrouping(DeviationPermissionKind value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval <em>Allow Removal</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval

+	 * <em>Allow Removal</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Allow Removal</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Allow Removal</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see #getAllowRemoval()

 	 * @generated

@@ -343,10 +372,10 @@ public interface DeviationAttributeSet extends EAElement {
 	 * Returns the value of the '<em><b>Base Data Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Data Type</em>' reference.

 	 * @see #setBase_DataType(DataType)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getDeviationAttributeSet_Base_DataType()

@@ -356,19 +385,25 @@ public interface DeviationAttributeSet extends EAElement {
 	DataType getBase_DataType();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType <em>Base Data Type</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType

+	 * <em>Base Data Type</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Data Type</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Data Type</em>' reference.

 	 * @see #getBase_DataType()

 	 * @generated

 	 */

 	void setBase_DataType(DataType value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}'

+	 * reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Feature</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Feature</em>' reference.

 	 * @see #getFeature()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationPermissionKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationPermissionKind.java
index fb7ad44f49d..336c3b918bc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationPermissionKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/DeviationPermissionKind.java
@@ -22,8 +22,8 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;

 

 /**

- * <!-- begin-user-doc --> A representation of the literals of the enumeration '

- * <em><b>Deviation Permission Kind</b></em>', and utility methods for working with them. <!--

+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Deviation Permission Kind</b></em>', and utility methods for

+ * working with them. <!--

  * end-user-doc --> <!-- begin-model-doc --> Possible values for deviation attributes.

  * 

  * Semantics: DeviationPermissionKind has no specific semantics. Further subclasses of

@@ -38,6 +38,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>No</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #NO_VALUE

 	 * @generated

 	 * @ordered

@@ -47,6 +48,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>Subtree</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #SUBTREE_VALUE

 	 * @generated

 	 * @ordered

@@ -56,6 +58,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>Append</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #APPEND_VALUE

 	 * @generated

 	 * @ordered

@@ -65,6 +68,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>Subset</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #SUBSET_VALUE

 	 * @generated

 	 * @ordered

@@ -74,6 +78,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>Yes</b></em>' literal object.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #YES_VALUE

 	 * @generated

 	 * @ordered

@@ -82,6 +87,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	 * The '<em><b>Widen</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #WIDEN_VALUE

 	 * @generated

 	 * @ordered

@@ -91,8 +97,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>NO</b></em>' literal value. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>NO</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>NO</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation is not allowed. <!--

 	 * end-model-doc -->

@@ -107,8 +112,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>SUBTREE</b></em>' literal value. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>SUBTREE</b></em>' literal object isn't clear, there really should

-	 * be more of a description here...

+	 * If the meaning of '<em><b>SUBTREE</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation permission holds for a complete

 	 * subtree. <!-- end-model-doc -->

@@ -123,8 +127,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>APPEND</b></em>' literal value. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>APPEND</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>APPEND</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation is allowed if achieved by

 	 * appending features <!-- end-model-doc -->

@@ -139,8 +142,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>SUBSET</b></em>' literal value. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>SUBSET</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>SUBSET</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation permission holds for a subset of

 	 * features. <!-- end-model-doc -->

@@ -155,8 +157,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * The '<em><b>YES</b></em>' literal value. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>YES</b></em>' literal object isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of '<em><b>YES</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation permission holds. <!--

 	 * end-model-doc -->

@@ -173,8 +174,10 @@ public enum DeviationPermissionKind implements Enumerator {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * Feature groups may only be widened, i.e. it is only legal to add features into a feature group that were not grouped before, but not to ungroup features. This kind is only applicable to deviation attribute 'allowRegrouping'.

+	 * Feature groups may only be widened, i.e. it is only legal to add features into a feature group that were not grouped before, but not to ungroup

+	 * features. This kind is only applicable to deviation attribute 'allowRegrouping'.

 	 * <!-- end-model-doc -->

+	 * 

 	 * @see #WIDEN

 	 * @model name="widen"

 	 * @generated

@@ -188,18 +191,12 @@ public enum DeviationPermissionKind implements Enumerator {
 	 * 

 	 * @generated

 	 */

-	private static final DeviationPermissionKind[] VALUES_ARRAY = new DeviationPermissionKind[] {

-			NO,

-			SUBTREE,

-			APPEND,

-			SUBSET,

-			YES,

-			WIDEN,

-		};

+	private static final DeviationPermissionKind[] VALUES_ARRAY = new DeviationPermissionKind[]{ NO, SUBTREE, APPEND, SUBSET, YES, WIDEN, };

 

 	/**

 	 * A public read-only list of all the '<em><b>Deviation Permission Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static final List<DeviationPermissionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -207,16 +204,23 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Deviation Permission Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static DeviationPermissionKind get(int value) {

-		switch (value) {

-			case NO_VALUE: return NO;

-			case SUBTREE_VALUE: return SUBTREE;

-			case APPEND_VALUE: return APPEND;

-			case SUBSET_VALUE: return SUBSET;

-			case YES_VALUE: return YES;

-			case WIDEN_VALUE: return WIDEN;

+		switch(value) {

+		case NO_VALUE:

+			return NO;

+		case SUBTREE_VALUE:

+			return SUBTREE;

+		case APPEND_VALUE:

+			return APPEND;

+		case SUBSET_VALUE:

+			return SUBSET;

+		case YES_VALUE:

+			return YES;

+		case WIDEN_VALUE:

+			return WIDEN;

 		}

 		return null;

 	}

@@ -224,12 +228,13 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * Returns the '<em><b>Deviation Permission Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static DeviationPermissionKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			DeviationPermissionKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

+			if(result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -243,9 +248,9 @@ public enum DeviationPermissionKind implements Enumerator {
 	 * @generated

 	 */

 	public static DeviationPermissionKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

 			DeviationPermissionKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

+			if(result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -254,18 +259,21 @@ public enum DeviationPermissionKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final int value;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String name;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private final String literal;

@@ -273,6 +281,7 @@ public enum DeviationPermissionKind implements Enumerator {
 	/**

 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private DeviationPermissionKind(int value, String name, String literal) {

@@ -283,26 +292,29 @@ public enum DeviationPermissionKind implements Enumerator {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getLiteral() {

-	  return literal;

+		return literal;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getName() {

-	  return name;

+		return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public int getValue() {

-	  return value;

+		return value;

 	}

 

 	/**

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehicleFeature.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehicleFeature.java
index 32aa2e989cb..f12b0fb81b3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehicleFeature.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehicleFeature.java
@@ -20,31 +20,35 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Vehicle Feature</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * VehicleFeature represents a special kind of feature intended for use on the vehicle level. The main difference to features in general is that they provide support for the multi-level concept (with their DeviationAttributeSet) and several additional attributes with meta-information specific to the vehicle level viewpoint.

+ * VehicleFeature represents a special kind of feature intended for use on the vehicle level. The main difference to features in general is that they

+ * provide support for the multi-level concept (with their DeviationAttributeSet) and several additional attributes with meta-information specific to

+ * the vehicle level viewpoint.

  * 

  * 

  * Constraints:

  * [1] VehicleFeatures can only be contained in FeatureModels on VehicleLevel.

  * 

  * Semantics:

- * A VehicleFeature is a functional or non-functional characteristic, constraint or property that can be present or not in a vehicle product line on the level of the complete system, i.e. vehicle.

+ * A VehicleFeature is a functional or non-functional characteristic, constraint or property that can be present or not in a vehicle product line on

+ * the level of the complete system, i.e. vehicle.

  * 

  * Extension:

  * Class

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale <em>Is Design Variability Rationale</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible <em>Is Customer Visible</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved <em>Is Removed</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet <em>Deviation Attribute Set</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale <em>Is Design Variability

+ * Rationale</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible <em>Is Customer Visible</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved <em>Is Removed</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet <em>Deviation Attribute Set</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getVehicleFeature()

  * @model

  * @generated

@@ -53,12 +57,11 @@ public interface VehicleFeature extends Feature {
 

 	/**

 	 * Returns the value of the '<em><b>Deviation Attribute Set</b></em>' containment reference. It

-	 * is bidirectional and its opposite is '

-	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature

+	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature

 	 * <em>Feature</em>}'. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Deviation Attribute Set</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Deviation Attribute Set</em>' containment reference isn't clear, there really should be more of a description

+	 * here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The deviation attributes belong to vehicle

 	 * features that are part of a reference feature model in the context of multi-level feature

@@ -78,10 +81,10 @@ public interface VehicleFeature extends Feature {
 	 * Returns the value of the '<em><b>Is Customer Visible</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Is Customer Visible</em>' attribute isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Is Customer Visible</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Is Customer Visible</em>' attribute.

 	 * @see #setIsCustomerVisible(boolean)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getVehicleFeature_IsCustomerVisible()

@@ -94,10 +97,10 @@ public interface VehicleFeature extends Feature {
 	 * Returns the value of the '<em><b>Is Design Variability Rationale</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Is Design Variability Rationale</em>' attribute isn't clear, there

-	 * really should be more of a description here...

+	 * If the meaning of the '<em>Is Design Variability Rationale</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Is Design Variability Rationale</em>' attribute.

 	 * @see #setIsDesignVariabilityRationale(boolean)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getVehicleFeature_IsDesignVariabilityRationale()

@@ -110,10 +113,10 @@ public interface VehicleFeature extends Feature {
 	 * Returns the value of the '<em><b>Is Removed</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Is Removed</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Is Removed</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Is Removed</em>' attribute.

 	 * @see #setIsRemoved(boolean)

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#getVehicleFeature_IsRemoved()

@@ -123,38 +126,50 @@ public interface VehicleFeature extends Feature {
 	boolean isIsRemoved();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet <em>Deviation Attribute Set</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet

+	 * <em>Deviation Attribute Set</em>}' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * @param value the new value of the '<em>Deviation Attribute Set</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Deviation Attribute Set</em>' reference.

 	 * @see #getDeviationAttributeSet()

 	 * @generated

 	 */

 	void setDeviationAttributeSet(DeviationAttributeSet value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible <em>Is Customer Visible</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible

+	 * <em>Is Customer Visible</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Is Customer Visible</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Is Customer Visible</em>' attribute.

 	 * @see #isIsCustomerVisible()

 	 * @generated

 	 */

 	void setIsCustomerVisible(boolean value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale <em>Is Design Variability Rationale</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale

+	 * <em>Is Design Variability Rationale</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

-	 * @param value the new value of the '<em>Is Design Variability Rationale</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Is Design Variability Rationale</em>' attribute.

 	 * @see #isIsDesignVariabilityRationale()

 	 * @generated

 	 */

 	void setIsDesignVariabilityRationale(boolean value);

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved <em>Is Removed</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved <em>Is Removed</em>}'

+	 * attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Is Removed</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Is Removed</em>' attribute.

 	 * @see #isIsRemoved()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingFactory.java
index e894ea07b50..576e1c4a17f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface VehiclefeaturemodelingFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	VehiclefeaturemodelingFactory eINSTANCE = org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface VehiclefeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Deviation Attribute Set</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Deviation Attribute Set</em>'.

 	 * @generated

 	 */

@@ -45,6 +48,7 @@ public interface VehiclefeaturemodelingFactory extends EFactory {
 	 * Returns a new object of class '<em>Vehicle Feature</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Vehicle Feature</em>'.

 	 * @generated

 	 */

@@ -53,6 +57,7 @@ public interface VehiclefeaturemodelingFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingPackage.java
index 608b0c83e76..fd62c3b1ccf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/VehiclefeaturemodelingPackage.java
@@ -66,13 +66,16 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl <em>Deviation Attribute Set</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl

+		 * <em>Deviation Attribute Set</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getDeviationAttributeSet()

 		 * @generated

@@ -82,6 +85,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allow Change Attribute</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE = eINSTANCE.getDeviationAttributeSet_AllowChangeAttribute();

@@ -89,6 +93,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allow Change Cardinality</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY = eINSTANCE.getDeviationAttributeSet_AllowChangeCardinality();

@@ -97,6 +102,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Allow Change Description</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION = eINSTANCE.getDeviationAttributeSet_AllowChangeDescription();

@@ -104,6 +110,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allow Change Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME = eINSTANCE.getDeviationAttributeSet_AllowChangeName();

@@ -127,6 +134,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allow Refinement</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT = eINSTANCE.getDeviationAttributeSet_AllowRefinement();

@@ -134,6 +142,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Allow Regrouping</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING = eINSTANCE.getDeviationAttributeSet_AllowRegrouping();

@@ -157,13 +166,16 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference DEVIATION_ATTRIBUTE_SET__FEATURE = eINSTANCE.getDeviationAttributeSet_Feature();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl <em>Vehicle Feature</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl

+		 * <em>Vehicle Feature</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getVehicleFeature()

 		 * @generated

@@ -173,6 +185,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Design Variability Rationale</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE = eINSTANCE.getVehicleFeature_IsDesignVariabilityRationale();

@@ -180,6 +193,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Is Customer Visible</b></em>' attribute feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE = eINSTANCE.getVehicleFeature_IsCustomerVisible();

@@ -195,13 +209,16 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Deviation Attribute Set</b></em>' reference feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET = eINSTANCE.getVehicleFeature_DeviationAttributeSet();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind <em>Deviation Permission Kind</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

+		 * <em>Deviation Permission Kind</em>}' enum.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 		 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getDeviationPermissionKind()

 		 * @generated

@@ -213,6 +230,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "vehiclefeaturemodeling";

@@ -220,6 +238,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Structure/VehicleFeatureModeling/1";

@@ -227,6 +246,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "VehicleFeatureModeling";

@@ -234,13 +254,16 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	VehiclefeaturemodelingPackage eINSTANCE = org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl <em>Deviation Attribute Set</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl

+	 * <em>Deviation Attribute Set</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getDeviationAttributeSet()

 	 * @generated

@@ -251,6 +274,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -260,6 +284,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -269,6 +294,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -296,6 +322,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Change Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -305,6 +332,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Change Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -314,6 +342,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Move</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -323,6 +352,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Reduction</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -332,6 +362,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Refinement</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -341,6 +372,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Regrouping</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -350,6 +382,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Allow Removal</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -359,6 +392,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -368,6 +402,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -383,8 +418,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	int DEVIATION_ATTRIBUTE_SET_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 11;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl <em>Vehicle Feature</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl

+	 * <em>Vehicle Feature</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getVehicleFeature()

 	 * @generated

@@ -395,6 +432,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -404,6 +442,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -440,6 +479,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -449,6 +489,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Cardinality</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -458,6 +499,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Required Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -467,6 +509,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Actual Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -476,6 +519,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Feature Parameter</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -485,6 +529,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Node</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -503,6 +548,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Customer Visible</b></em>' attribute.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -512,6 +558,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Removed</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -536,8 +583,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	int VEHICLE_FEATURE_FEATURE_COUNT = FeaturemodelingPackage.FEATURE_FEATURE_COUNT + 4;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind <em>Deviation Permission Kind</em>}' enum.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

+	 * <em>Deviation Permission Kind</em>}' enum.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehiclefeaturemodelingPackageImpl#getDeviationPermissionKind()

 	 * @generated

@@ -545,8 +594,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	int DEVIATION_PERMISSION_KIND = 2;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet <em>Deviation Attribute Set</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet

+	 * <em>Deviation Attribute Set</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Deviation Attribute Set</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet

 	 * @generated

@@ -554,8 +605,11 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EClass getDeviationAttributeSet();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute <em>Allow Change Attribute</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute

+	 * <em>Allow Change Attribute</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Change Attribute</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeAttribute()

 	 * @see #getDeviationAttributeSet()

@@ -564,8 +618,11 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowChangeAttribute();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality <em>Allow Change Cardinality</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality

+	 * <em>Allow Change Cardinality</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Change Cardinality</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeCardinality()

 	 * @see #getDeviationAttributeSet()

@@ -574,9 +631,12 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowChangeCardinality();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription <em>Allow Change Description</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription

+	 * <em>Allow Change Description</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Change Description</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeDescription()

 	 * @see #getDeviationAttributeSet()

@@ -585,8 +645,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowChangeDescription();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName <em>Allow Change Name</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName <em>Allow Change Name</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Change Name</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowChangeName()

 	 * @see #getDeviationAttributeSet()

@@ -595,8 +657,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowChangeName();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove <em>Allow Move</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove <em>Allow Move</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Move</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowMove()

 	 * @see #getDeviationAttributeSet()

@@ -605,8 +669,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowMove();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction <em>Allow Reduction</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction <em>Allow Reduction</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Reduction</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowReduction()

 	 * @see #getDeviationAttributeSet()

@@ -615,8 +681,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowReduction();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement <em>Allow Refinement</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement <em>Allow Refinement</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Refinement</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRefinement()

 	 * @see #getDeviationAttributeSet()

@@ -625,8 +693,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowRefinement();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping <em>Allow Regrouping</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping <em>Allow Regrouping</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Regrouping</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRegrouping()

 	 * @see #getDeviationAttributeSet()

@@ -635,8 +705,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowRegrouping();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval <em>Allow Removal</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval <em>Allow Removal</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Allow Removal</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getAllowRemoval()

 	 * @see #getDeviationAttributeSet()

@@ -645,9 +717,11 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getDeviationAttributeSet_AllowRemoval();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType <em>Base Data Type</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType <em>Base Data Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Data Type</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getBase_DataType()

 	 * @see #getDeviationAttributeSet()

@@ -656,8 +730,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EReference getDeviationAttributeSet_Base_DataType();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature <em>Feature</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Feature</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet#getFeature()

 	 * @see #getDeviationAttributeSet()

@@ -666,8 +742,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EReference getDeviationAttributeSet_Feature();

 

 	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind <em>Deviation Permission Kind</em>}'.

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

+	 * <em>Deviation Permission Kind</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for enum '<em>Deviation Permission Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind

 	 * @generated

@@ -675,8 +753,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EEnum getDeviationPermissionKind();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature <em>Vehicle Feature</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature <em>Vehicle Feature</em>}

+	 * '.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Vehicle Feature</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature

 	 * @generated

@@ -684,8 +764,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EClass getVehicleFeature();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet <em>Deviation Attribute Set</em>}'.

+	 * Returns the meta object for the reference '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet <em>Deviation Attribute Set</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Deviation Attribute Set</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#getDeviationAttributeSet()

 	 * @see #getVehicleFeature()

@@ -694,8 +776,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EReference getVehicleFeature_DeviationAttributeSet();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible <em>Is Customer Visible</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible <em>Is Customer Visible</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Customer Visible</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsCustomerVisible()

 	 * @see #getVehicleFeature()

@@ -704,8 +788,11 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getVehicleFeature_IsCustomerVisible();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale <em>Is Design Variability Rationale</em>}'.

+	 * Returns the meta object for the attribute '

+	 * {@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale

+	 * <em>Is Design Variability Rationale</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Design Variability Rationale</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsDesignVariabilityRationale()

 	 * @see #getVehicleFeature()

@@ -714,8 +801,10 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	EAttribute getVehicleFeature_IsDesignVariabilityRationale();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved <em>Is Removed</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved

+	 * <em>Is Removed</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Removed</em>'.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature#isIsRemoved()

 	 * @see #getVehicleFeature()

@@ -727,6 +816,7 @@ public interface VehiclefeaturemodelingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/DeviationAttributeSetImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/DeviationAttributeSetImpl.java
index 11c9c8019b3..5925132decf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/DeviationAttributeSetImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/DeviationAttributeSetImpl.java
@@ -29,25 +29,30 @@ import org.eclipse.uml2.uml.DataType;
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Deviation Attribute Set</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Deviation Attribute Set</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeAttribute <em>Allow Change Attribute</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeCardinality <em>Allow Change Cardinality</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeDescription <em>Allow Change Description</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeName <em>Allow Change Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowMove <em>Allow Move</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowReduction <em>Allow Reduction</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRefinement <em>Allow Refinement</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRegrouping <em>Allow Regrouping</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRemoval <em>Allow Removal</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getBase_DataType <em>Base Data Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getFeature <em>Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeAttribute <em>Allow Change

+ * Attribute</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeCardinality <em>Allow Change

+ * Cardinality</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeDescription <em>Allow Change

+ * Description</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowChangeName <em>Allow Change Name

+ * </em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowMove <em>Allow Move</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowReduction <em>Allow Reduction</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRefinement <em>Allow Refinement

+ * </em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRegrouping <em>Allow Regrouping

+ * </em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getAllowRemoval <em>Allow Removal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getBase_DataType <em>Base Data Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.DeviationAttributeSetImpl#getFeature <em>Feature</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class DeviationAttributeSetImpl extends EAElementImpl implements DeviationAttributeSet {

@@ -55,15 +60,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowChangeAttribute() <em>Allow Change Attribute</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeAttribute()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_CHANGE_ATTRIBUTE_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_CHANGE_ATTRIBUTE_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowChangeAttribute() <em>Allow Change Attribute</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeAttribute()

 	 * @generated

 	 * @ordered

@@ -73,15 +80,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowChangeCardinality() <em>Allow Change Cardinality</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeCardinality()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_CHANGE_CARDINALITY_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_CHANGE_CARDINALITY_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowChangeCardinality() <em>Allow Change Cardinality</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeCardinality()

 	 * @generated

 	 * @ordered

@@ -92,16 +101,18 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	 * The default value of the '{@link #getAllowChangeDescription() <em>Allow Change Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeDescription()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_CHANGE_DESCRIPTION_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_CHANGE_DESCRIPTION_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowChangeDescription() <em>Allow Change Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeDescription()

 	 * @generated

 	 * @ordered

@@ -111,15 +122,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowChangeName() <em>Allow Change Name</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeName()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_CHANGE_NAME_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_CHANGE_NAME_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowChangeName() <em>Allow Change Name</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowChangeName()

 	 * @generated

 	 * @ordered

@@ -134,7 +147,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_MOVE_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_MOVE_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowMove() <em>Allow Move</em>}' attribute. <!--

@@ -149,15 +162,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowReduction() <em>Allow Reduction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowReduction()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_REDUCTION_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_REDUCTION_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowReduction() <em>Allow Reduction</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowReduction()

 	 * @generated

 	 * @ordered

@@ -167,15 +182,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowRefinement() <em>Allow Refinement</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowRefinement()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_REFINEMENT_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_REFINEMENT_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowRefinement() <em>Allow Refinement</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowRefinement()

 	 * @generated

 	 * @ordered

@@ -185,15 +202,17 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * The default value of the '{@link #getAllowRegrouping() <em>Allow Regrouping</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowRegrouping()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_REGROUPING_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_REGROUPING_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowRegrouping() <em>Allow Regrouping</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getAllowRegrouping()

 	 * @generated

 	 * @ordered

@@ -208,7 +227,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	 * @generated

 	 * @ordered

 	 */

-	protected static final DeviationPermissionKind ALLOW_REMOVAL_EDEFAULT = DeviationPermissionKind.NO;

+	protected static final DeviationPermissionKind ALLOW_REMOVAL_EDEFAULT = DeviationPermissionKind.YES;

 

 	/**

 	 * The cached value of the '{@link #getAllowRemoval() <em>Allow Removal</em>}' attribute. <!--

@@ -224,6 +243,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_DataType()

 	 * @generated

 	 * @ordered

@@ -234,6 +254,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	 * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getFeature()

 	 * @generated

 	 * @ordered

@@ -242,6 +263,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected DeviationAttributeSetImpl() {

@@ -251,6 +273,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehicleFeature basicGetFeature() {

@@ -259,160 +282,172 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public NotificationChain basicSetFeature(VehicleFeature newFeature, NotificationChain msgs) {

 		VehicleFeature oldFeature = feature;

 		feature = newFeature;

-		if (eNotificationRequired()) {

+		if(eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, oldFeature, newFeature);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

+			if(msgs == null)

+				msgs = notification;

+			else

+				msgs.add(notification);

 		}

 		return msgs;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

-				return getAllowChangeAttribute();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

-				return getAllowChangeCardinality();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

-				return getAllowChangeDescription();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

-				return getAllowChangeName();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

-				return getAllowMove();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

-				return getAllowReduction();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

-				return getAllowRefinement();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

-				return getAllowRegrouping();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

-				return getAllowRemoval();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

-				if (resolve) return getBase_DataType();

-				return basicGetBase_DataType();

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				if (resolve) return getFeature();

-				return basicGetFeature();

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

+			return getAllowChangeAttribute();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

+			return getAllowChangeCardinality();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

+			return getAllowChangeDescription();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

+			return getAllowChangeName();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

+			return getAllowMove();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

+			return getAllowReduction();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

+			return getAllowRefinement();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

+			return getAllowRegrouping();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

+			return getAllowRemoval();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

+			if(resolve)

+				return getBase_DataType();

+			return basicGetBase_DataType();

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			if(resolve)

+				return getFeature();

+			return basicGetFeature();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				if (feature != null)

-					msgs = ((InternalEObject)feature).eInverseRemove(this, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, VehicleFeature.class, msgs);

-				return basicSetFeature((VehicleFeature)otherEnd, msgs);

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			if(feature != null)

+				msgs = ((InternalEObject)feature).eInverseRemove(this, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, VehicleFeature.class, msgs);

+			return basicSetFeature((VehicleFeature)otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				return basicSetFeature(null, msgs);

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			return basicSetFeature(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

-				return allowChangeAttribute != ALLOW_CHANGE_ATTRIBUTE_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

-				return allowChangeCardinality != ALLOW_CHANGE_CARDINALITY_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

-				return allowChangeDescription != ALLOW_CHANGE_DESCRIPTION_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

-				return allowChangeName != ALLOW_CHANGE_NAME_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

-				return allowMove != ALLOW_MOVE_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

-				return allowReduction != ALLOW_REDUCTION_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

-				return allowRefinement != ALLOW_REFINEMENT_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

-				return allowRegrouping != ALLOW_REGROUPING_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

-				return allowRemoval != ALLOW_REMOVAL_EDEFAULT;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

-				return base_DataType != null;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				return feature != null;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

+			return allowChangeAttribute != ALLOW_CHANGE_ATTRIBUTE_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

+			return allowChangeCardinality != ALLOW_CHANGE_CARDINALITY_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

+			return allowChangeDescription != ALLOW_CHANGE_DESCRIPTION_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

+			return allowChangeName != ALLOW_CHANGE_NAME_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

+			return allowMove != ALLOW_MOVE_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

+			return allowReduction != ALLOW_REDUCTION_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

+			return allowRefinement != ALLOW_REFINEMENT_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

+			return allowRegrouping != ALLOW_REGROUPING_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

+			return allowRemoval != ALLOW_REMOVAL_EDEFAULT;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

+			return base_DataType != null;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			return feature != null;

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

-				setAllowChangeAttribute((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

-				setAllowChangeCardinality((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

-				setAllowChangeDescription((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

-				setAllowChangeName((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

-				setAllowMove((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

-				setAllowReduction((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

-				setAllowRefinement((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

-				setAllowRegrouping((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

-				setAllowRemoval((DeviationPermissionKind)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

-				setBase_DataType((DataType)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				setFeature((VehicleFeature)newValue);

-				return;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

+			setAllowChangeAttribute((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

+			setAllowChangeCardinality((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

+			setAllowChangeDescription((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

+			setAllowChangeName((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

+			setAllowMove((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

+			setAllowReduction((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

+			setAllowRefinement((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

+			setAllowRegrouping((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

+			setAllowRemoval((DeviationPermissionKind)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

+			setBase_DataType((DataType)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			setFeature((VehicleFeature)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -422,50 +457,52 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

-				setAllowChangeAttribute(ALLOW_CHANGE_ATTRIBUTE_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

-				setAllowChangeCardinality(ALLOW_CHANGE_CARDINALITY_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

-				setAllowChangeDescription(ALLOW_CHANGE_DESCRIPTION_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

-				setAllowChangeName(ALLOW_CHANGE_NAME_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

-				setAllowMove(ALLOW_MOVE_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

-				setAllowReduction(ALLOW_REDUCTION_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

-				setAllowRefinement(ALLOW_REFINEMENT_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

-				setAllowRegrouping(ALLOW_REGROUPING_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

-				setAllowRemoval(ALLOW_REMOVAL_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

-				setBase_DataType((DataType)null);

-				return;

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

-				setFeature((VehicleFeature)null);

-				return;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE:

+			setAllowChangeAttribute(ALLOW_CHANGE_ATTRIBUTE_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY:

+			setAllowChangeCardinality(ALLOW_CHANGE_CARDINALITY_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION:

+			setAllowChangeDescription(ALLOW_CHANGE_DESCRIPTION_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME:

+			setAllowChangeName(ALLOW_CHANGE_NAME_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE:

+			setAllowMove(ALLOW_MOVE_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION:

+			setAllowReduction(ALLOW_REDUCTION_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT:

+			setAllowRefinement(ALLOW_REFINEMENT_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING:

+			setAllowRegrouping(ALLOW_REGROUPING_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL:

+			setAllowRemoval(ALLOW_REMOVAL_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE:

+			setBase_DataType((DataType)null);

+			return;

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE:

+			setFeature((VehicleFeature)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowChangeAttribute() {

@@ -474,6 +511,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowChangeCardinality() {

@@ -483,6 +521,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowChangeDescription() {

@@ -491,6 +530,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowChangeName() {

@@ -499,6 +539,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowMove() {

@@ -507,6 +548,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowReduction() {

@@ -515,6 +557,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowRefinement() {

@@ -523,6 +566,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowRegrouping() {

@@ -531,6 +575,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind getAllowRemoval() {

@@ -539,14 +584,15 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehicleFeature getFeature() {

-		if (feature != null && feature.eIsProxy()) {

+		if(feature != null && feature.eIsProxy()) {

 			InternalEObject oldFeature = (InternalEObject)feature;

 			feature = (VehicleFeature)eResolveProxy(oldFeature);

-			if (feature != oldFeature) {

-				if (eNotificationRequired())

+			if(feature != oldFeature) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, oldFeature, feature));

 			}

 		}

@@ -555,115 +601,125 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowChangeAttribute(DeviationPermissionKind newAllowChangeAttribute) {

 		DeviationPermissionKind oldAllowChangeAttribute = allowChangeAttribute;

 		allowChangeAttribute = newAllowChangeAttribute == null ? ALLOW_CHANGE_ATTRIBUTE_EDEFAULT : newAllowChangeAttribute;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_ATTRIBUTE, oldAllowChangeAttribute, allowChangeAttribute));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowChangeCardinality(DeviationPermissionKind newAllowChangeCardinality) {

 		DeviationPermissionKind oldAllowChangeCardinality = allowChangeCardinality;

 		allowChangeCardinality = newAllowChangeCardinality == null ? ALLOW_CHANGE_CARDINALITY_EDEFAULT : newAllowChangeCardinality;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_CARDINALITY, oldAllowChangeCardinality, allowChangeCardinality));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowChangeDescription(DeviationPermissionKind newAllowChangeDescription) {

 		DeviationPermissionKind oldAllowChangeDescription = allowChangeDescription;

 		allowChangeDescription = newAllowChangeDescription == null ? ALLOW_CHANGE_DESCRIPTION_EDEFAULT : newAllowChangeDescription;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_DESCRIPTION, oldAllowChangeDescription, allowChangeDescription));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowChangeName(DeviationPermissionKind newAllowChangeName) {

 		DeviationPermissionKind oldAllowChangeName = allowChangeName;

 		allowChangeName = newAllowChangeName == null ? ALLOW_CHANGE_NAME_EDEFAULT : newAllowChangeName;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_CHANGE_NAME, oldAllowChangeName, allowChangeName));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowMove(DeviationPermissionKind newAllowMove) {

 		DeviationPermissionKind oldAllowMove = allowMove;

 		allowMove = newAllowMove == null ? ALLOW_MOVE_EDEFAULT : newAllowMove;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_MOVE, oldAllowMove, allowMove));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowReduction(DeviationPermissionKind newAllowReduction) {

 		DeviationPermissionKind oldAllowReduction = allowReduction;

 		allowReduction = newAllowReduction == null ? ALLOW_REDUCTION_EDEFAULT : newAllowReduction;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REDUCTION, oldAllowReduction, allowReduction));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowRefinement(DeviationPermissionKind newAllowRefinement) {

 		DeviationPermissionKind oldAllowRefinement = allowRefinement;

 		allowRefinement = newAllowRefinement == null ? ALLOW_REFINEMENT_EDEFAULT : newAllowRefinement;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REFINEMENT, oldAllowRefinement, allowRefinement));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowRegrouping(DeviationPermissionKind newAllowRegrouping) {

 		DeviationPermissionKind oldAllowRegrouping = allowRegrouping;

 		allowRegrouping = newAllowRegrouping == null ? ALLOW_REGROUPING_EDEFAULT : newAllowRegrouping;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REGROUPING, oldAllowRegrouping, allowRegrouping));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setAllowRemoval(DeviationPermissionKind newAllowRemoval) {

 		DeviationPermissionKind oldAllowRemoval = allowRemoval;

 		allowRemoval = newAllowRemoval == null ? ALLOW_REMOVAL_EDEFAULT : newAllowRemoval;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__ALLOW_REMOVAL, oldAllowRemoval, allowRemoval));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DataType getBase_DataType() {

-		if (base_DataType != null && base_DataType.eIsProxy()) {

+		if(base_DataType != null && base_DataType.eIsProxy()) {

 			InternalEObject oldBase_DataType = (InternalEObject)base_DataType;

 			base_DataType = (DataType)eResolveProxy(oldBase_DataType);

-			if (base_DataType != oldBase_DataType) {

-				if (eNotificationRequired())

+			if(base_DataType != oldBase_DataType) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

 			}

 		}

@@ -673,6 +729,7 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DataType basicGetBase_DataType() {

@@ -682,40 +739,44 @@ public class DeviationAttributeSetImpl extends EAElementImpl implements Deviatio
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_DataType(DataType newBase_DataType) {

 		DataType oldBase_DataType = base_DataType;

 		base_DataType = newBase_DataType;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setFeature(VehicleFeature newFeature) {

-		if (newFeature != feature) {

+		if(newFeature != feature) {

 			NotificationChain msgs = null;

-			if (feature != null)

+			if(feature != null)

 				msgs = ((InternalEObject)feature).eInverseRemove(this, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, VehicleFeature.class, msgs);

-			if (newFeature != null)

+			if(newFeature != null)

 				msgs = ((InternalEObject)newFeature).eInverseAdd(this, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, VehicleFeature.class, msgs);

 			msgs = basicSetFeature(newFeature, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, newFeature, newFeature));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (allowChangeAttribute: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehicleFeatureImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehicleFeatureImpl.java
index f578705d5ee..0629ba4a721 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehicleFeatureImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehicleFeatureImpl.java
@@ -32,13 +32,15 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.Vehiclefeatu
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsDesignVariabilityRationale <em>Is Design Variability Rationale</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsCustomerVisible <em>Is Customer Visible</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsRemoved <em>Is Removed</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#getDeviationAttributeSet <em>Deviation Attribute Set</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsDesignVariabilityRationale <em>Is Design

+ * Variability Rationale</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsCustomerVisible <em>Is Customer Visible</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#isIsRemoved <em>Is Removed</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.impl.VehicleFeatureImpl#getDeviationAttributeSet <em>Deviation Attribute

+ * Set</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {

@@ -47,6 +49,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	 * The default value of the '{@link #isIsDesignVariabilityRationale() <em>Is Design Variability Rationale</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @see #isIsDesignVariabilityRationale()

 	 * @generated

 	 * @ordered

@@ -57,6 +60,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	 * The cached value of the '{@link #isIsDesignVariabilityRationale() <em>Is Design Variability Rationale</em>}' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @see #isIsDesignVariabilityRationale()

 	 * @generated

 	 * @ordered

@@ -66,6 +70,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	/**

 	 * The default value of the '{@link #isIsCustomerVisible() <em>Is Customer Visible</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #isIsCustomerVisible()

 	 * @generated

 	 * @ordered

@@ -75,6 +80,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	/**

 	 * The cached value of the '{@link #isIsCustomerVisible() <em>Is Customer Visible</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #isIsCustomerVisible()

 	 * @generated

 	 * @ordered

@@ -104,6 +110,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	/**

 	 * The cached value of the '{@link #getDeviationAttributeSet() <em>Deviation Attribute Set</em>}' reference.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getDeviationAttributeSet()

 	 * @generated

 	 * @ordered

@@ -112,6 +119,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected VehicleFeatureImpl() {

@@ -121,6 +129,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationAttributeSet basicGetDeviationAttributeSet() {

@@ -129,112 +138,122 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	public NotificationChain basicSetDeviationAttributeSet(DeviationAttributeSet newDeviationAttributeSet,

-			NotificationChain msgs) {

+	public NotificationChain basicSetDeviationAttributeSet(DeviationAttributeSet newDeviationAttributeSet, NotificationChain msgs) {

 		DeviationAttributeSet oldDeviationAttributeSet = deviationAttributeSet;

 		deviationAttributeSet = newDeviationAttributeSet;

-		if (eNotificationRequired()) {

+		if(eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, oldDeviationAttributeSet, newDeviationAttributeSet);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

+			if(msgs == null)

+				msgs = notification;

+			else

+				msgs.add(notification);

 		}

 		return msgs;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

-				return isIsDesignVariabilityRationale();

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

-				return isIsCustomerVisible();

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

-				return isIsRemoved();

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				if (resolve) return getDeviationAttributeSet();

-				return basicGetDeviationAttributeSet();

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

+			return isIsDesignVariabilityRationale();

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

+			return isIsCustomerVisible();

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

+			return isIsRemoved();

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			if(resolve)

+				return getDeviationAttributeSet();

+			return basicGetDeviationAttributeSet();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				if (deviationAttributeSet != null)

-					msgs = ((InternalEObject)deviationAttributeSet).eInverseRemove(this, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, DeviationAttributeSet.class, msgs);

-				return basicSetDeviationAttributeSet((DeviationAttributeSet)otherEnd, msgs);

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			if(deviationAttributeSet != null)

+				msgs = ((InternalEObject)deviationAttributeSet).eInverseRemove(this, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, DeviationAttributeSet.class, msgs);

+			return basicSetDeviationAttributeSet((DeviationAttributeSet)otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				return basicSetDeviationAttributeSet(null, msgs);

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			return basicSetDeviationAttributeSet(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

-				return isDesignVariabilityRationale != IS_DESIGN_VARIABILITY_RATIONALE_EDEFAULT;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

-				return isCustomerVisible != IS_CUSTOMER_VISIBLE_EDEFAULT;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

-				return isRemoved != IS_REMOVED_EDEFAULT;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				return deviationAttributeSet != null;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

+			return isDesignVariabilityRationale != IS_DESIGN_VARIABILITY_RATIONALE_EDEFAULT;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

+			return isCustomerVisible != IS_CUSTOMER_VISIBLE_EDEFAULT;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

+			return isRemoved != IS_REMOVED_EDEFAULT;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			return deviationAttributeSet != null;

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	

+

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

-				setIsDesignVariabilityRationale((Boolean)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

-				setIsCustomerVisible((Boolean)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

-				setIsRemoved((Boolean)newValue);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				setDeviationAttributeSet((DeviationAttributeSet)newValue);

-				return;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

+			setIsDesignVariabilityRationale((Boolean)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

+			setIsCustomerVisible((Boolean)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

+			setIsRemoved((Boolean)newValue);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			setDeviationAttributeSet((DeviationAttributeSet)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -244,37 +263,39 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

-				setIsDesignVariabilityRationale(IS_DESIGN_VARIABILITY_RATIONALE_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

-				setIsCustomerVisible(IS_CUSTOMER_VISIBLE_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

-				setIsRemoved(IS_REMOVED_EDEFAULT);

-				return;

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

-				setDeviationAttributeSet((DeviationAttributeSet)null);

-				return;

+		switch(featureID) {

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE:

+			setIsDesignVariabilityRationale(IS_DESIGN_VARIABILITY_RATIONALE_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE:

+			setIsCustomerVisible(IS_CUSTOMER_VISIBLE_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED:

+			setIsRemoved(IS_REMOVED_EDEFAULT);

+			return;

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET:

+			setDeviationAttributeSet((DeviationAttributeSet)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationAttributeSet getDeviationAttributeSet() {

-		if (deviationAttributeSet != null && deviationAttributeSet.eIsProxy()) {

+		if(deviationAttributeSet != null && deviationAttributeSet.eIsProxy()) {

 			InternalEObject oldDeviationAttributeSet = (InternalEObject)deviationAttributeSet;

 			deviationAttributeSet = (DeviationAttributeSet)eResolveProxy(oldDeviationAttributeSet);

-			if (deviationAttributeSet != oldDeviationAttributeSet) {

-				if (eNotificationRequired())

+			if(deviationAttributeSet != oldDeviationAttributeSet) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, oldDeviationAttributeSet, deviationAttributeSet));

 			}

 		}

@@ -283,6 +304,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public boolean isIsCustomerVisible() {

@@ -291,6 +313,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public boolean isIsDesignVariabilityRationale() {

@@ -299,6 +322,7 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public boolean isIsRemoved() {

@@ -307,62 +331,68 @@ public class VehicleFeatureImpl extends FeatureImpl implements VehicleFeature {
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setDeviationAttributeSet(DeviationAttributeSet newDeviationAttributeSet) {

-		if (newDeviationAttributeSet != deviationAttributeSet) {

+		if(newDeviationAttributeSet != deviationAttributeSet) {

 			NotificationChain msgs = null;

-			if (deviationAttributeSet != null)

+			if(deviationAttributeSet != null)

 				msgs = ((InternalEObject)deviationAttributeSet).eInverseRemove(this, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, DeviationAttributeSet.class, msgs);

-			if (newDeviationAttributeSet != null)

+			if(newDeviationAttributeSet != null)

 				msgs = ((InternalEObject)newDeviationAttributeSet).eInverseAdd(this, VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET__FEATURE, DeviationAttributeSet.class, msgs);

 			msgs = basicSetDeviationAttributeSet(newDeviationAttributeSet, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__DEVIATION_ATTRIBUTE_SET, newDeviationAttributeSet, newDeviationAttributeSet));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setIsCustomerVisible(boolean newIsCustomerVisible) {

 		boolean oldIsCustomerVisible = isCustomerVisible;

 		isCustomerVisible = newIsCustomerVisible;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_CUSTOMER_VISIBLE, oldIsCustomerVisible, isCustomerVisible));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setIsDesignVariabilityRationale(boolean newIsDesignVariabilityRationale) {

 		boolean oldIsDesignVariabilityRationale = isDesignVariabilityRationale;

 		isDesignVariabilityRationale = newIsDesignVariabilityRationale;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_DESIGN_VARIABILITY_RATIONALE, oldIsDesignVariabilityRationale, isDesignVariabilityRationale));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setIsRemoved(boolean newIsRemoved) {

 		boolean oldIsRemoved = isRemoved;

 		isRemoved = newIsRemoved;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VehiclefeaturemodelingPackage.VEHICLE_FEATURE__IS_REMOVED, oldIsRemoved, isRemoved));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (isDesignVariabilityRationale: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingFactoryImpl.java
index 5d072303896..7a4b2af55df 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.*;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationPermissionKind;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature;

@@ -30,12 +31,14 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.Vehiclefeatu
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements VehiclefeaturemodelingFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -47,16 +50,16 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static VehiclefeaturemodelingFactory init() {

 		try {

 			VehiclefeaturemodelingFactory theVehiclefeaturemodelingFactory = (VehiclefeaturemodelingFactory)EPackage.Registry.INSTANCE.getEFactory(VehiclefeaturemodelingPackage.eNS_URI);

-			if (theVehiclefeaturemodelingFactory != null) {

+			if(theVehiclefeaturemodelingFactory != null) {

 				return theVehiclefeaturemodelingFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new VehiclefeaturemodelingFactoryImpl();

@@ -65,6 +68,7 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingFactoryImpl() {

@@ -73,6 +77,7 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String convertDeviationPermissionKindToString(EDataType eDataType, Object instanceValue) {

@@ -81,34 +86,39 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case VehiclefeaturemodelingPackage.DEVIATION_PERMISSION_KIND:

-				return convertDeviationPermissionKindToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case VehiclefeaturemodelingPackage.DEVIATION_PERMISSION_KIND:

+			return convertDeviationPermissionKindToString(eDataType, instanceValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET: return createDeviationAttributeSet();

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE: return createVehicleFeature();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET:

+			return createDeviationAttributeSet();

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE:

+			return createVehicleFeature();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationAttributeSet createDeviationAttributeSet() {

@@ -118,30 +128,34 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DeviationPermissionKind createDeviationPermissionKindFromString(EDataType eDataType, String initialValue) {

 		DeviationPermissionKind result = DeviationPermissionKind.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		if(result == null)

+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case VehiclefeaturemodelingPackage.DEVIATION_PERMISSION_KIND:

-				return createDeviationPermissionKindFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		switch(eDataType.getClassifierID()) {

+		case VehiclefeaturemodelingPackage.DEVIATION_PERMISSION_KIND:

+			return createDeviationPermissionKindFromString(eDataType, initialValue);

+		default:

+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehicleFeature createVehicleFeature() {

@@ -151,6 +165,7 @@ public class VehiclefeaturemodelingFactoryImpl extends EFactoryImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingPackage getVehiclefeaturemodelingPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingPackageImpl.java
index c33f507227f..35cce12b1e7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/impl/VehiclefeaturemodelingPackageImpl.java
@@ -87,12 +87,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements VehiclefeaturemodelingPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -100,16 +102,18 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 	/**

 	 * 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 VehiclefeaturemodelingPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link VehiclefeaturemodelingPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static VehiclefeaturemodelingPackage init() {

-		if (isInited) return (VehiclefeaturemodelingPackage)EPackage.Registry.INSTANCE.getEPackage(VehiclefeaturemodelingPackage.eNS_URI);

+		if(isInited)

+			return (VehiclefeaturemodelingPackage)EPackage.Registry.INSTANCE.getEPackage(VehiclefeaturemodelingPackage.eNS_URI);

 

 		// Obtain or create and register package

 		VehiclefeaturemodelingPackageImpl theVehiclefeaturemodelingPackage = (VehiclefeaturemodelingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VehiclefeaturemodelingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VehiclefeaturemodelingPackageImpl());

@@ -211,7 +215,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 		// Mark meta-data to indicate it can't be changed

 		theVehiclefeaturemodelingPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(VehiclefeaturemodelingPackage.eNS_URI, theVehiclefeaturemodelingPackage);

 		return theVehiclefeaturemodelingPackage;

@@ -219,43 +223,47 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass deviationAttributeSetEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass vehicleFeatureEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EEnum deviationPermissionKindEEnum = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage#eNS_URI

 	 * @see #init()

@@ -266,13 +274,15 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -301,6 +311,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getDeviationAttributeSet() {

@@ -309,6 +320,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowChangeAttribute() {

@@ -317,6 +329,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowChangeCardinality() {

@@ -326,6 +339,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowChangeDescription() {

@@ -334,6 +348,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowChangeName() {

@@ -342,6 +357,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowMove() {

@@ -350,6 +366,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowReduction() {

@@ -358,6 +375,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowRefinement() {

@@ -366,6 +384,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowRegrouping() {

@@ -374,6 +393,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getDeviationAttributeSet_AllowRemoval() {

@@ -383,6 +403,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDeviationAttributeSet_Base_DataType() {

@@ -391,6 +412,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getDeviationAttributeSet_Feature() {

@@ -399,6 +421,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EEnum getDeviationPermissionKind() {

@@ -407,6 +430,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getVehicleFeature() {

@@ -415,6 +439,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVehicleFeature_DeviationAttributeSet() {

@@ -423,6 +448,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getVehicleFeature_IsCustomerVisible() {

@@ -431,6 +457,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getVehicleFeature_IsDesignVariabilityRationale() {

@@ -439,6 +466,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getVehicleFeature_IsRemoved() {

@@ -447,6 +475,7 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingFactory getVehiclefeaturemodelingFactory() {

@@ -454,13 +483,15 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

@@ -484,15 +515,15 @@ public class VehiclefeaturemodelingPackageImpl extends EPackageImpl implements V
 

 		// Initialize classes and features; add operations and parameters

 		initEClass(deviationAttributeSetEClass, DeviationAttributeSet.class, "DeviationAttributeSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getDeviationAttributeSet_AllowChangeAttribute(), this.getDeviationPermissionKind(), "allowChangeAttribute", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowChangeCardinality(), this.getDeviationPermissionKind(), "allowChangeCardinality", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowChangeDescription(), this.getDeviationPermissionKind(), "allowChangeDescription", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowChangeName(), this.getDeviationPermissionKind(), "allowChangeName", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowMove(), this.getDeviationPermissionKind(), "allowMove", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowReduction(), this.getDeviationPermissionKind(), "allowReduction", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowRefinement(), this.getDeviationPermissionKind(), "allowRefinement", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowRegrouping(), this.getDeviationPermissionKind(), "allowRegrouping", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getDeviationAttributeSet_AllowRemoval(), this.getDeviationPermissionKind(), "allowRemoval", "YES", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowChangeAttribute(), this.getDeviationPermissionKind(), "allowChangeAttribute", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowChangeCardinality(), this.getDeviationPermissionKind(), "allowChangeCardinality", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowChangeDescription(), this.getDeviationPermissionKind(), "allowChangeDescription", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowChangeName(), this.getDeviationPermissionKind(), "allowChangeName", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowMove(), this.getDeviationPermissionKind(), "allowMove", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowReduction(), this.getDeviationPermissionKind(), "allowReduction", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowRefinement(), this.getDeviationPermissionKind(), "allowRefinement", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowRegrouping(), this.getDeviationPermissionKind(), "allowRegrouping", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getDeviationAttributeSet_AllowRemoval(), this.getDeviationPermissionKind(), "allowRemoval", "yes", 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getDeviationAttributeSet_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getDeviationAttributeSet_Feature(), this.getVehicleFeature(), this.getVehicleFeature_DeviationAttributeSet(), "feature", null, 1, 1, DeviationAttributeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingAdapterFactory.java
index f04bd44a827..d99847518ba 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingAdapterFactory.java
@@ -23,14 +23,16 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode;

+import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.*;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage;

 

 

 /**

- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage

  * @generated

  */

@@ -39,6 +41,7 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static VehiclefeaturemodelingPackage modelPackage;

@@ -47,46 +50,55 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected VehiclefeaturemodelingSwitch<Adapter> modelSwitch = new VehiclefeaturemodelingSwitch<Adapter>() {

-			@Override

-			public Adapter caseDeviationAttributeSet(DeviationAttributeSet object) {

-				return createDeviationAttributeSetAdapter();

-			}

-			@Override

-			public Adapter caseVehicleFeature(VehicleFeature object) {

-				return createVehicleFeatureAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter caseFeatureTreeNode(FeatureTreeNode object) {

-				return createFeatureTreeNodeAdapter();

-			}

-			@Override

-			public Adapter caseFeature(Feature object) {

-				return createFeatureAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseDeviationAttributeSet(DeviationAttributeSet object) {

+			return createDeviationAttributeSetAdapter();

+		}

+

+		@Override

+		public Adapter caseVehicleFeature(VehicleFeature object) {

+			return createVehicleFeatureAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureTreeNode(FeatureTreeNode object) {

+			return createFeatureTreeNodeAdapter();

+		}

+

+		@Override

+		public Adapter caseFeature(Feature object) {

+			return createFeatureAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = VehiclefeaturemodelingPackage.eINSTANCE;

 		}

 	}

@@ -94,7 +106,9 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -109,6 +123,7 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -118,10 +133,12 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet <em>Deviation Attribute Set</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet

+	 * <em>Deviation Attribute Set</em>}'.

 	 * <!-- begin-user-doc --> This default implementation

 	 * returns null so that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet

 	 * @generated

@@ -134,6 +151,7 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -146,6 +164,7 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that

 	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

 	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature

 	 * @generated

@@ -155,10 +174,12 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode <em>Feature Tree Node</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode

+	 * <em>Feature Tree Node</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns

 	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will

 	 * catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode

 	 * @generated

@@ -168,10 +189,12 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature <em>Vehicle Feature</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature

+	 * <em>Vehicle Feature</em>}'.

 	 * <!-- begin-user-doc --> This default implementation returns null

 	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch

 	 * all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature

 	 * @generated

@@ -186,6 +209,7 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -199,15 +223,16 @@ public class VehiclefeaturemodelingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceFactoryImpl.java
index 98854a8c2a6..42b024b1882 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.util.VehiclefeaturemodelingResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class VehiclefeaturemodelingResourceFactoryImpl extends ResourceFactoryIm
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class VehiclefeaturemodelingResourceFactoryImpl extends ResourceFactoryIm
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceImpl.java
index 41ff9c51197..bb61c6f94e9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.util.VehiclefeaturemodelingResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class VehiclefeaturemodelingResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public VehiclefeaturemodelingResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingSwitch.java
index 369efde179d..1716602336b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingSwitch.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature;

 import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureTreeNode;

+import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.*;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.DeviationAttributeSet;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehicleFeature;

 import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage;

@@ -33,6 +34,7 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.Vehiclefeatu
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.VehiclefeaturemodelingPackage

  * @generated

  */

@@ -41,6 +43,7 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static VehiclefeaturemodelingPackage modelPackage;

@@ -48,10 +51,11 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingSwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = VehiclefeaturemodelingPackage.eINSTANCE;

 		}

 	}

@@ -60,6 +64,7 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -75,7 +80,9 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -88,7 +95,9 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Deviation Attribute Set</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Deviation Attribute Set</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -103,7 +112,7 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -116,7 +125,9 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Feature Tree Node</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Tree Node</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -129,7 +140,9 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Vehicle Feature</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Vehicle Feature</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -144,7 +157,9 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -159,7 +174,7 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -172,30 +187,41 @@ public class VehiclefeaturemodelingSwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET: {

-				DeviationAttributeSet deviationAttributeSet = (DeviationAttributeSet)theEObject;

-				T result = caseDeviationAttributeSet(deviationAttributeSet);

-				if (result == null) result = caseEAElement(deviationAttributeSet);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VehiclefeaturemodelingPackage.VEHICLE_FEATURE: {

-				VehicleFeature vehicleFeature = (VehicleFeature)theEObject;

-				T result = caseVehicleFeature(vehicleFeature);

-				if (result == null) result = caseFeature(vehicleFeature);

-				if (result == null) result = caseFeatureTreeNode(vehicleFeature);

-				if (result == null) result = caseContext(vehicleFeature);

-				if (result == null) result = caseEAElement(vehicleFeature);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case VehiclefeaturemodelingPackage.DEVIATION_ATTRIBUTE_SET:

+		{

+			DeviationAttributeSet deviationAttributeSet = (DeviationAttributeSet)theEObject;

+			T result = caseDeviationAttributeSet(deviationAttributeSet);

+			if(result == null)

+				result = caseEAElement(deviationAttributeSet);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VehiclefeaturemodelingPackage.VEHICLE_FEATURE:

+		{

+			VehicleFeature vehicleFeature = (VehicleFeature)theEObject;

+			T result = caseVehicleFeature(vehicleFeature);

+			if(result == null)

+				result = caseFeature(vehicleFeature);

+			if(result == null)

+				result = caseFeatureTreeNode(vehicleFeature);

+			if(result == null)

+				result = caseContext(vehicleFeature);

+			if(result == null)

+				result = caseEAElement(vehicleFeature);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingXMLProcessor.java
index f70b5abe61f..98708ea87d3 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/vehiclefeaturemodeling/util/VehiclefeaturemodelingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.structure.vehiclefeaturemodeling.Vehiclefeatu
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VehiclefeaturemodelingXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class VehiclefeaturemodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehiclefeaturemodelingXMLProcessor() {

@@ -44,11 +46,12 @@ public class VehiclefeaturemodelingXMLProcessor extends XMLProcessor {
 	/**

 	 * Register for "*" and "xml" file extensions the VehiclefeaturemodelingResourceFactoryImpl factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new VehiclefeaturemodelingResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new VehiclefeaturemodelingResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Event.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Event.java
index 72fed478b1f..bbc34269292 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Event.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Event.java
@@ -18,30 +18,41 @@ package org.eclipse.papyrus.eastadl.timing;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Event</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * An Event (E) is supposed to denote a distinct form of state change in a running system, taking place at distinct points in time called occurrences of the event. An event may also report a [current] state. In that case, the event occurs periodically. For example, the "driver door has been opened" is an event indicating a state change; whereas the "driver door is open" is an event reporting a state.
+ * An Event (E) is supposed to denote a distinct form of state change in a running system, taking place at distinct points in time called occurrences
+ * of the event. An event may also report a [current] state. In that case, the event occurs periodically. For example, the
+ * "driver door has been opened" is an event indicating a state change; whereas the "driver door is open" is an event reporting a state.
  * 
- * A running system can be observed by identifying certain forms of state changes to watch for, and for each such observation point, noting the times when changes occur. This notion of observation also applies to a hypothetical predicted run of a system or a system model from a timing perspective, the only information that needs to be in the output of such a prediction is a sequence of times for each observation point, indicating the times that each event is predicted to occur.
+ * A running system can be observed by identifying certain forms of state changes to watch for, and for each such observation point, noting the times
+ * when changes occur. This notion of observation also applies to a hypothetical predicted run of a system or a system model from a timing
+ * perspective, the only information that needs to be in the output of such a prediction is a sequence of times for each observation point, indicating
+ * the times that each event is predicted to occur.
  * 
- * The occurrence of an event either stimulates an execution, or is caused by an execution [as a response to another event that occurred before]. In the first case the event is called Stimulus (S) and in the latter case it is called Response (R). Stimuli always precede responses; and responses in turn always succeed stimuli.
+ * The occurrence of an event either stimulates an execution, or is caused by an execution [as a response to another event that occurred before]. In
+ * the first case the event is called Stimulus (S) and in the latter case it is called Response (R). Stimuli always precede responses; and responses
+ * in turn always succeed stimuli.
  * 
- * An event occurs instantaneously, which means that an event occurs at a time instant without any duration. In addition, an event can appear any number of times and the subsequent occurrences may follow a specific pattern, like periodic, sporadic, or in sudden bursts. Each of these occurrences has a unique time instant. 
+ * An event occurs instantaneously, which means that an event occurs at a time instant without any duration. In addition, an event can appear any
+ * number of times and the subsequent occurrences may follow a specific pattern, like periodic, sporadic, or in sudden bursts. Each of these
+ * occurrences has a unique time instant.
  * 
- * The distinction between an event and its occurrence is usually obvious from the considered context (causal and temporal). The event is not defined by its occurrences, but rather by a description expressing its purpose.
+ * The distinction between an event and its occurrence is usually obvious from the considered context (causal and temporal). The event is not defined
+ * by its occurrences, but rather by a description expressing its purpose.
  * 
  * 
  * Constraints:
- * [1] In the case that the event reports a [current] state (isStateChange is FALSE), the event must have a periodic event model [or a pattern model]. Rationale: The [current] state shall be reported consistently and periodically.
+ * [1] In the case that the event reports a [current] state (isStateChange is FALSE), the event must have a periodic event model [or a pattern model].
+ * Rationale: The [current] state shall be reported consistently and periodically.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.Event#isIsStateChanged <em>Is State Changed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.Event#isIsStateChanged <em>Is State Changed</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getEvent()
  * @model abstract="true"
  * @generated
@@ -54,10 +65,12 @@ public interface Event extends TimingDescription {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * This attribute indicates whether the event reports a state change or a [current] state. If the boolean value is TRUE, then the event reports a state change (no over-undersampling). 
-	 * If the boolean value is FALSE, then the event reports a [current] state. 
+	 * This attribute indicates whether the event reports a state change or a [current] state. If the boolean value is TRUE, then the event reports a
+	 * state change (no over-undersampling).
+	 * If the boolean value is FALSE, then the event reports a [current] state.
 	 * By default, the value of this attribute is TRUE.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Is State Changed</em>' attribute.
 	 * @see #setIsStateChanged(boolean)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getEvent_IsStateChanged()
@@ -70,7 +83,9 @@ public interface Event extends TimingDescription {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.Event#isIsStateChanged <em>Is State Changed</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is State Changed</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is State Changed</em>' attribute.
 	 * @see #isIsStateChanged()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/EventChain.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/EventChain.java
index 05009b6afcb..fd6ee8303da 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/EventChain.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/EventChain.java
@@ -20,29 +20,37 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Event Chain</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The purpose of event chains is to describe the temporal behavior of a number of steps to be taken to respond to one or more events accordingly. [An event chain is also used to express that a temporal requirement/constraint is imposed on a number of steps to respond to one or more events accordingly (-> requirement).] Such events could be observed in a given system and are categorized into stimuli and responses.
+ * The purpose of event chains is to describe the temporal behavior of a number of steps to be taken to respond to one or more events accordingly. [An
+ * event chain is also used to express that a temporal requirement/constraint is imposed on a number of steps to respond to one or more events
+ * accordingly (-> requirement).] Such events could be observed in a given system and are categorized into stimuli and responses.
  * 
- * Event chains can refer to other event chains which are then called event chain segments or strands. Segments are sequential event chains refining an EventChain, while strands define parallel event chains that refine an EventChain. An EventChain can be both a segment and a strand at the same time. An event chain respectively event chain segment can be atomic which means it is not refined to other event chains.
+ * Event chains can refer to other event chains which are then called event chain segments or strands. Segments are sequential event chains refining
+ * an EventChain, while strands define parallel event chains that refine an EventChain. An EventChain can be both a segment and a strand at the same
+ * time. An event chain respectively event chain segment can be atomic which means it is not refined to other event chains.
  * 
  * Constraints:
  * [1] The cardinality of strand shall be either 0 or greater than 1. Rationale: Only values > 1 express true parallelism.
  * 
  * Semantics:
- * An EventChain references two groups of events: stimulus and response. The semantics is that each event in the stimulus group somehow causes, or at least affects the value of all events in the response group. However, since questions about causality and value influence clearly involve the semantics of the underlying structural model, this aspect of an EventChain is semantically outside its scope. Instead, delay constraint semantics are defined solely in terms of the times at which the stimulus and response events occur, independently of whether there actually exists a causal connection between these events in the structural model.
+ * An EventChain references two groups of events: stimulus and response. The semantics is that each event in the stimulus group somehow causes, or at
+ * least affects the value of all events in the response group. However, since questions about causality and value influence clearly involve the
+ * semantics of the underlying structural model, this aspect of an EventChain is semantically outside its scope. Instead, delay constraint semantics
+ * are defined solely in terms of the times at which the stimulus and response events occur, independently of whether there actually exists a causal
+ * connection between these events in the structural model.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getSegment <em>Segment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStrand <em>Strand</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getResponse <em>Response</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStimulus <em>Stimulus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getSegment <em>Segment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStrand <em>Strand</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getResponse <em>Response</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStimulus <em>Stimulus</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getEventChain()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/ExecutionTimeConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/ExecutionTimeConstraint.java
index 287d5b45e4a..4861a216ebe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/ExecutionTimeConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/ExecutionTimeConstraint.java
@@ -23,15 +23,19 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Execution Time Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ExecutionTimeConstraint expresses the execution time of a function under the assumption of a nominal CPU that executes 1 "function second" per second. Function allocation will decide the actual execution time by multiplication with the relative speed of the host CPU. 
+ * ExecutionTimeConstraint expresses the execution time of a function under the assumption of a nominal CPU that executes 1 "function second" per
+ * second. Function allocation will decide the actual execution time by multiplication with the relative speed of the host CPU.
  * 
  * Example:
- * The ECU is 20% faster than a standard ECU (e.g. in a certain context, execution times are given assuming a nominal speed of 100 MHz; Our CPU is then 120 MHz) 
+ * The ECU is 20% faster than a standard ECU (e.g. in a certain context, execution times are given assuming a nominal speed of 100 MHz; Our CPU is
+ * then 120 MHz)
  * 
- * The function is activated by a time trigger or a port trigger. The function starts execution some time after activation, depending on e.g. interference and blocking from other functions on the same resource
- * Immediately on start, the function reads input data on all ports. Functions write data at the latest when the execution time has elapsed (which is after the execution time plus any blocking and interference time). 
+ * The function is activated by a time trigger or a port trigger. The function starts execution some time after activation, depending on e.g.
+ * interference and blocking from other functions on the same resource
+ * Immediately on start, the function reads input data on all ports. Functions write data at the latest when the execution time has elapsed (which is
+ * after the execution time plus any blocking and interference time).
  * 
  * Constraints:
  * [1] An ExecutionTimeConstraint either identifies a FunctionType or a FunctionPrototype as its target function.
@@ -49,32 +53,34 @@ import org.eclipse.papyrus.eastadl.structure.functionmodeling.DesignFunctionType
  * best case execution time of 6 and worst case of 7 is within this constraint
  * best case execution time of 6 and worst case of 9 violates this constraint
  * 
- * If a measured value is characterized, variation is not used, as it is always upper-lower, e.g. lower=6 and upper=9 above. In this example, the ExecutionTimeConstraint would be a Realization of a VVActualOutcome.
+ * If a measured value is characterized, variation is not used, as it is always upper-lower, e.g. lower=6 and upper=9 above. In this example, the
+ * ExecutionTimeConstraint would be a Realization of a VVActualOutcome.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getVariation <em>Variation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType <em>Target Design Function Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction <em>Target Design Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype <em>Target Design Function Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getVariation <em>Variation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType <em>Target Design Function Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction <em>Target Design Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype <em>Target Design Function Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getExecutionTimeConstraint()
  * @model
  * @generated
  */
 public interface ExecutionTimeConstraint extends TimingConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Target Design Function Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Design Function Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Design Function Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Design Function Type</em>' reference.
 	 * @see #setTargetDesignFunctionType(DesignFunctionType)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getExecutionTimeConstraint_TargetDesignFunctionType()
@@ -87,10 +93,10 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	 * Returns the value of the '<em><b>Variation</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Variation</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Variation</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Variation</em>' reference.
 	 * @see #setVariation(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getExecutionTimeConstraint_Variation()
@@ -100,10 +106,13 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	TimeDuration getVariation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType <em>Target Design Function Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType
+	 * <em>Target Design Function Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Design Function Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target Design Function Type</em>' reference.
 	 * @see #getTargetDesignFunctionType()
 	 * @generated
 	 */
@@ -113,10 +122,10 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	 * Returns the value of the '<em><b>Target Design Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Design Function</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Design Function</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Design Function</em>' reference.
 	 * @see #setTargetDesignFunction(DesignFunctionType)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getExecutionTimeConstraint_TargetDesignFunction()
@@ -126,10 +135,13 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	DesignFunctionType getTargetDesignFunction();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction <em>Target Design Function</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction
+	 * <em>Target Design Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Design Function</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target Design Function</em>' reference.
 	 * @see #getTargetDesignFunction()
 	 * @generated
 	 */
@@ -139,10 +151,10 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	 * Returns the value of the '<em><b>Target Design Function Prototype</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Design Function Prototype</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Design Function Prototype</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Design Function Prototype</em>' reference.
 	 * @see #setTargetDesignFunctionPrototype(DesignFunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getExecutionTimeConstraint_TargetDesignFunctionPrototype()
@@ -152,10 +164,13 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	DesignFunctionPrototype getTargetDesignFunctionPrototype();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype <em>Target Design Function Prototype</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype
+	 * <em>Target Design Function Prototype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Design Function Prototype</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target Design Function Prototype</em>' reference.
 	 * @see #getTargetDesignFunctionPrototype()
 	 * @generated
 	 */
@@ -165,7 +180,9 @@ public interface ExecutionTimeConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getVariation <em>Variation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Variation</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Variation</em>' reference.
 	 * @see #getVariation()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/PrecedenceConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/PrecedenceConstraint.java
index 27c2486b88e..3502e75f6ef 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/PrecedenceConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/PrecedenceConstraint.java
@@ -24,14 +24,16 @@ import org.eclipse.uml2.uml.Dependency;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Precedence Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The PrecedenceConstraint represents a particular constraint applied on the execution sequence of functions.
  * 
  * Semantics:
- * The semantics for the PrecedenceConstraint metaclass is to define an association relationship between Functions, indicating the association relationship such that all predecessors have completed before the successors are started.
+ * The semantics for the PrecedenceConstraint metaclass is to define an association relationship between Functions, indicating the association
+ * relationship such that all predecessors have completed before the successors are started.
  * 
- * Note: Without a precedence relation, Functions are executed according to their data dependencies, if these are uni-directional. For bi-directional data dependencies, execution order is not defined unless the PrecedenceDependency relationship is used.
+ * Note: Without a precedence relation, Functions are executed according to their data dependencies, if these are uni-directional. For bi-directional
+ * data dependencies, execution order is not defined unless the PrecedenceDependency relationship is used.
  * 
  * Notation:
  * PrecedenceConstraint is shown as a dashed arrow with "Precedes" next to it. It points from preceeding to the successive entity.
@@ -39,26 +41,27 @@ import org.eclipse.uml2.uml.Dependency;
  * Changes:
  * Renamed from Precedes
  * 
- * Extension: 
+ * Extension:
  * The PrecedenceConstraint extends UML2 metaclass Class and Dependency.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive <em>Successive</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding <em>Preceding</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive_path <em>Successive path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding_path <em>Preceding path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive <em>Successive</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding <em>Preceding</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive_path <em>Successive path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding_path <em>Preceding path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint()
  * @model
  * @generated
  */
 public interface PrecedenceConstraint extends TimingConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Preceding</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -67,6 +70,7 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * The function prototype that must be executed first.
 	 * {derived from UML::DirectedRelationship::source}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Preceding</em>' reference.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint_Preceding()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
@@ -78,10 +82,10 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Dependency</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Dependency</em>' reference.
 	 * @see #setBase_Dependency(Dependency)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint_Base_Dependency()
@@ -94,7 +98,9 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Dependency</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Dependency</em>' reference.
 	 * @see #getBase_Dependency()
 	 * @generated
 	 */
@@ -105,10 +111,10 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Successive path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Successive path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Successive path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint_Successive_path()
 	 * @model
@@ -121,10 +127,10 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Preceding path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Preceding path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Preceding path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint_Preceding_path()
 	 * @model
@@ -141,6 +147,7 @@ public interface PrecedenceConstraint extends TimingConstraint {
 	 * The function prototypes that must be executed after preceding was executed.
 	 * {derived from UML::DirectedRelationship::target}
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Successive</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getPrecedenceConstraint_Successive()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimeDuration.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimeDuration.java
index d54158b59ac..dd30937e692 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimeDuration.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimeDuration.java
@@ -24,59 +24,62 @@ import org.eclipse.uml2.uml.DataType;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Time Duration</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * CseCodeType 
- * 0:	1 µsec 		Time	
- * 1:	10 µsec		Time	
- * 2:	100 µsec	Time	
- * 3:	1 msec		Time	
- * 4:	10 msec		Time	
- * 5:	100 msec	Time	
- * 6:	1 sec		Time	
- * 7:	10 sec		Time	
- * 8:	1 min		Time	
- * 9:	1 h		Time	
- * 10:	1 d		Time	
+ * CseCodeType
+ * 0: 1 µsec Time
+ * 1: 10 µsec Time
+ * 2: 100 µsec Time
+ * 3: 1 msec Time
+ * 4: 10 msec Time
+ * 5: 100 msec Time
+ * 6: 1 sec Time
+ * 7: 10 sec Time
+ * 8: 1 min Time
+ * 9: 1 h Time
+ * 10: 1 d Time
  * 
- * 100:	Angular degrees			Angle	
- * 101:	Revolutions 360 degrees	Angle	
- * 102:	Cycle 720 degrees		Angle	e.g. in case of IC engines
- * 103:	Cylinder segment		Combustion	e.g. in case of IC engines
- * 998:	When frame available	Time	Source defined in the ASAP 2 keyword, FRAME
- * 999:	Always if there is new value		Calculation of a new upper range limit after receiving a new partial value, e.g. when calculating a complex trigger condition
- * 1000:	Non deterministic		Without fixed scaling
+ * 100: Angular degrees Angle
+ * 101: Revolutions 360 degrees Angle
+ * 102: Cycle 720 degrees Angle e.g. in case of IC engines
+ * 103: Cylinder segment Combustion e.g. in case of IC engines
+ * 998: When frame available Time Source defined in the ASAP 2 keyword, FRAME
+ * 999: Always if there is new value Calculation of a new upper range limit after receiving a new partial value, e.g. when calculating a complex
+ * trigger condition
+ * 1000: Non deterministic Without fixed scaling
  * 
- * If, for example, the value in swCseCodeFactor is 360 and the value in swCseCode is 100, this is equivalent to the value 1 in swCseCodeFactor and the value 101 in swCseCode.
+ * If, for example, the value in swCseCodeFactor is 360 and the value in swCseCode is 100, this is equivalent to the value 1 in swCseCodeFactor and
+ * the value 101 in swCseCode.
  * 
  * CseCodeType is from AUTOSAR and MSR/ASAM.
  * 
  * Note that we have set the cseCodeType for 1 µsec to 0 (error in AUTOSAR R3). And have changed cseCodeType 2 to 100 µsec (error in MSR).
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getBase_DataType <em>Base Data Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCode <em>Cse Code</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCodeFactor <em>Cse Code Factor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getBase_DataType <em>Base Data Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCode <em>Cse Code</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCodeFactor <em>Cse Code Factor</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimeDuration()
  * @model
  * @generated
  */
 public interface TimeDuration extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Data Type</em>' reference.
 	 * @see #setBase_DataType(DataType)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimeDuration_Base_DataType()
@@ -89,7 +92,9 @@ public interface TimeDuration extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getBase_DataType <em>Base Data Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Data Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Data Type</em>' reference.
 	 * @see #getBase_DataType()
 	 * @generated
 	 */
@@ -102,6 +107,7 @@ public interface TimeDuration extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Within TIMMO this is normally time, note that when it is expressed as angle it can be converted to time.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Cse Code</em>' attribute.
 	 * @see #setCseCode(int)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimeDuration_CseCode()
@@ -114,7 +120,9 @@ public interface TimeDuration extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCode <em>Cse Code</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cse Code</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Cse Code</em>' attribute.
 	 * @see #getCseCode()
 	 * @generated
 	 */
@@ -128,6 +136,7 @@ public interface TimeDuration extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * Is normally equal to 1.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Cse Code Factor</em>' attribute.
 	 * @see #setCseCodeFactor(int)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimeDuration_CseCodeFactor()
@@ -140,7 +149,9 @@ public interface TimeDuration extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCodeFactor <em>Cse Code Factor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cse Code Factor</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Cse Code Factor</em>' attribute.
 	 * @see #getCseCodeFactor()
 	 * @generated
 	 */
@@ -153,6 +164,7 @@ public interface TimeDuration extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The actual value complemented with the cseCode.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(Float)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimeDuration_Value()
@@ -165,7 +177,9 @@ public interface TimeDuration extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Timing.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Timing.java
index 26e6af316fe..2ea9be8c30f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Timing.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/Timing.java
@@ -22,21 +22,22 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Timing</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The collection of timing constraints and their descriptions in the form of events and event chains. This collection can be done across the EAST-ADL2 abstraction levels.
+ * The collection of timing constraints and their descriptions in the form of events and event chains. This collection can be done across the
+ * EAST-ADL2 abstraction levels.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingConstraint <em>Timing Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingDescription <em>Timing Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingConstraint <em>Timing Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingDescription <em>Timing Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTiming()
  * @model
  * @generated
@@ -48,10 +49,10 @@ public interface Timing extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.timing.TimingConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Timing Constraint</em>' reference list isn't clear, there really
-	 * should be more of a description here...
+	 * If the meaning of the '<em>Timing Constraint</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Timing Constraint</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTiming_TimingConstraint()
 	 * @model ordered="false"
@@ -64,10 +65,10 @@ public interface Timing extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.timing.TimingDescription}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Timing Description</em>' reference list isn't clear, there really
-	 * should be more of a description here...
+	 * If the meaning of the '<em>Timing Description</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Timing Description</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTiming_TimingDescription()
 	 * @model ordered="false"
@@ -79,10 +80,10 @@ public interface Timing extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTiming_Base_Class()
@@ -95,7 +96,9 @@ public interface Timing extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -105,10 +108,10 @@ public interface Timing extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTiming_Base_Package()
@@ -121,7 +124,9 @@ public interface Timing extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingConstraint.java
index 3d957dc8a19..9b7b25229f6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingConstraint.java
@@ -25,7 +25,7 @@ import org.eclipse.uml2.uml.Constraint;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * TimingConstraint is an abstract entity that identifies a mode.
  * 
@@ -34,33 +34,37 @@ import org.eclipse.uml2.uml.Constraint;
  * 
  * 
  * Semantics:
- * The TimingConstraint does not describe what is classically referred to as a design constraint but has the role of a property, requirement, or a validation result. It is a requirement if this TimingConstraint refines a Requirement (by the Refine relationship). The TimingConstraint is a validation result if it realizes a VVActualOutcome, it is an intended validation result if it realizes a VVIntendedOutcome, and in other cases it denotes a property.
+ * The TimingConstraint does not describe what is classically referred to as a design constraint but has the role of a property, requirement, or a
+ * validation result. It is a requirement if this TimingConstraint refines a Requirement (by the Refine relationship). The TimingConstraint is a
+ * validation result if it realizes a VVActualOutcome, it is an intended validation result if it realizes a VVIntendedOutcome, and in other cases it
+ * denotes a property.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getUpper <em>Upper</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getLower <em>Lower</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getUpper <em>Upper</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getLower <em>Lower</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint()
  * @model abstract="true"
  * @generated
  */
 public interface TimingConstraint extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Lower</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Lower</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Lower</em>' reference.
 	 * @see #setLower(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint_Lower()
@@ -77,6 +81,7 @@ public interface TimingConstraint extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The mode where the TimingConstraint is valid.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint_Mode()
 	 * @model ordered="false"
@@ -88,10 +93,10 @@ public interface TimingConstraint extends EAElement {
 	 * Returns the value of the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Upper</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Upper</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Upper</em>' reference.
 	 * @see #setUpper(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint_Upper()
@@ -104,7 +109,9 @@ public interface TimingConstraint extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getLower <em>Lower</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lower</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Lower</em>' reference.
 	 * @see #getLower()
 	 * @generated
 	 */
@@ -114,10 +121,10 @@ public interface TimingConstraint extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint_Base_Class()
@@ -130,7 +137,9 @@ public interface TimingConstraint extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -140,10 +149,10 @@ public interface TimingConstraint extends EAElement {
 	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Constraint</em>' reference.
 	 * @see #setBase_Constraint(Constraint)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingConstraint_Base_Constraint()
@@ -156,7 +165,9 @@ public interface TimingConstraint extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Constraint</em>' reference.
 	 * @see #getBase_Constraint()
 	 * @generated
 	 */
@@ -166,7 +177,9 @@ public interface TimingConstraint extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getUpper <em>Upper</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Upper</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Upper</em>' reference.
 	 * @see #getUpper()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingDescription.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingDescription.java
index 743c2c95c1c..23fbcb52d2a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingDescription.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingDescription.java
@@ -21,18 +21,18 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Description</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * An abstract metaclass describing the timing events and their relations within the model.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.TimingDescription#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.TimingDescription#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingDescription()
  * @model abstract="true"
  * @generated
@@ -43,10 +43,10 @@ public interface TimingDescription extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#getTimingDescription_Base_Class()
@@ -59,7 +59,9 @@ public interface TimingDescription extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.TimingDescription#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingFactory.java
index a50dba8b3d4..babda8e99ed 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each
  * non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage
  * @generated
  */
@@ -28,6 +29,7 @@ public interface TimingFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	TimingFactory eINSTANCE = org.eclipse.papyrus.eastadl.timing.impl.TimingFactoryImpl.init();
@@ -36,6 +38,7 @@ public interface TimingFactory extends EFactory {
 	 * Returns a new object of class '<em>Event Chain</em>'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Event Chain</em>'.
 	 * @generated
 	 */
@@ -45,6 +48,7 @@ public interface TimingFactory extends EFactory {
 	 * Returns a new object of class '<em>Execution Time Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Execution Time Constraint</em>'.
 	 * @generated
 	 */
@@ -54,6 +58,7 @@ public interface TimingFactory extends EFactory {
 	 * Returns a new object of class '<em>Precedence Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Precedence Constraint</em>'.
 	 * @generated
 	 */
@@ -63,6 +68,7 @@ public interface TimingFactory extends EFactory {
 	 * Returns a new object of class '<em>Time Duration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Time Duration</em>'.
 	 * @generated
 	 */
@@ -80,6 +86,7 @@ public interface TimingFactory extends EFactory {
 	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingPackage.java
index 98f1c8a0315..7f87e2d9b4c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/TimingPackage.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.ElementsPackage;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingFactory
  * @model kind="package"
  * @generated
@@ -47,6 +48,7 @@ public interface TimingPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -54,6 +56,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl <em>Description</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimingDescription()
 		 * @generated
@@ -71,6 +74,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl <em>Constraint</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimingConstraint()
 		 * @generated
@@ -89,6 +93,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Upper</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING_CONSTRAINT__UPPER = eINSTANCE.getTimingConstraint_Upper();
@@ -97,6 +102,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Lower</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING_CONSTRAINT__LOWER = eINSTANCE.getTimingConstraint_Lower();
@@ -105,6 +111,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING_CONSTRAINT__BASE_CLASS = eINSTANCE.getTimingConstraint_Base_Class();
@@ -113,6 +120,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING_CONSTRAINT__BASE_CONSTRAINT = eINSTANCE.getTimingConstraint_Base_Constraint();
@@ -120,6 +128,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl <em>Event Chain</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getEventChain()
 		 * @generated
@@ -161,6 +170,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.EventImpl <em>Event</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.EventImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getEvent()
 		 * @generated
@@ -170,14 +180,17 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Is State Changed</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EVENT__IS_STATE_CHANGED = eINSTANCE.getEvent_IsStateChanged();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl <em>Execution Time Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl
+		 * <em>Execution Time Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getExecutionTimeConstraint()
 		 * @generated
@@ -188,6 +201,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Variation</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXECUTION_TIME_CONSTRAINT__VARIATION = eINSTANCE.getExecutionTimeConstraint_Variation();
@@ -196,6 +210,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Design Function Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE = eINSTANCE.getExecutionTimeConstraint_TargetDesignFunctionType();
@@ -204,6 +219,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Design Function</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION = eINSTANCE.getExecutionTimeConstraint_TargetDesignFunction();
@@ -212,14 +228,17 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Design Function Prototype</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE = eINSTANCE.getExecutionTimeConstraint_TargetDesignFunctionPrototype();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl <em>Precedence Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl <em>Precedence Constraint</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getPrecedenceConstraint()
 		 * @generated
@@ -230,6 +249,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Successive</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRECEDENCE_CONSTRAINT__SUCCESSIVE = eINSTANCE.getPrecedenceConstraint_Successive();
@@ -238,6 +258,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Preceding</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRECEDENCE_CONSTRAINT__PRECEDING = eINSTANCE.getPrecedenceConstraint_Preceding();
@@ -246,6 +267,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY = eINSTANCE.getPrecedenceConstraint_Base_Dependency();
@@ -254,6 +276,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Successive path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH = eINSTANCE.getPrecedenceConstraint_Successive_path();
@@ -262,6 +285,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Preceding path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PRECEDENCE_CONSTRAINT__PRECEDING_PATH = eINSTANCE.getPrecedenceConstraint_Preceding_path();
@@ -270,6 +294,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl <em>Time Duration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimeDuration()
 		 * @generated
@@ -280,6 +305,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Data Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIME_DURATION__BASE_DATA_TYPE = eINSTANCE.getTimeDuration_Base_DataType();
@@ -288,6 +314,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Cse Code</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TIME_DURATION__CSE_CODE = eINSTANCE.getTimeDuration_CseCode();
@@ -296,6 +323,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Cse Code Factor</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TIME_DURATION__CSE_CODE_FACTOR = eINSTANCE.getTimeDuration_CseCodeFactor();
@@ -304,6 +332,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TIME_DURATION__VALUE = eINSTANCE.getTimeDuration_Value();
@@ -311,6 +340,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl <em>Timing</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTiming()
 		 * @generated
@@ -320,6 +350,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Timing Constraint</b></em>' reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING__TIMING_CONSTRAINT = eINSTANCE.getTiming_TimingConstraint();
@@ -327,6 +358,7 @@ public interface TimingPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Timing Description</b></em>' reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING__TIMING_DESCRIPTION = eINSTANCE.getTiming_TimingDescription();
@@ -343,6 +375,7 @@ public interface TimingPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TIMING__BASE_PACKAGE = eINSTANCE.getTiming_Base_Package();
@@ -352,6 +385,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "timing";
@@ -359,6 +393,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Timing/1";
@@ -366,6 +401,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Timing";
@@ -373,6 +409,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	TimingPackage eINSTANCE = org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl.init();
@@ -380,6 +417,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl <em>Description</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimingDescription()
 	 * @generated
@@ -390,6 +428,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -399,6 +438,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -408,6 +448,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -417,6 +458,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -426,6 +468,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Description</em>' class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -434,6 +477,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl <em>Constraint</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimingConstraint()
 	 * @generated
@@ -444,6 +488,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -453,6 +498,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -462,6 +508,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -471,6 +518,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -480,6 +528,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -489,6 +538,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -498,6 +548,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -507,6 +558,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -516,6 +568,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -524,6 +577,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl <em>Event Chain</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getEventChain()
 	 * @generated
@@ -533,6 +587,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.EventImpl <em>Event</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.EventImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getEvent()
 	 * @generated
@@ -542,6 +597,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl <em>Timing</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTiming()
 	 * @generated
@@ -549,9 +605,11 @@ public interface TimingPackage extends EPackage {
 	int TIMING = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl <em>Execution Time Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl <em>Execution Time Constraint</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getExecutionTimeConstraint()
 	 * @generated
@@ -562,6 +620,7 @@ public interface TimingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl <em>Precedence Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getPrecedenceConstraint()
 	 * @generated
@@ -572,6 +631,7 @@ public interface TimingPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl <em>Time Duration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.impl.TimingPackageImpl#getTimeDuration()
 	 * @generated
@@ -582,6 +642,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -591,6 +652,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -600,6 +662,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -609,6 +672,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -618,6 +682,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Cse Code</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -627,6 +692,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Cse Code Factor</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -636,6 +702,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -645,6 +712,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Time Duration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -654,6 +722,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -663,6 +732,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -672,6 +742,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -681,6 +752,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -690,6 +762,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -717,6 +790,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -726,6 +800,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -735,6 +810,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Timing</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -744,6 +820,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -753,6 +830,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -762,6 +840,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -771,6 +850,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -780,6 +860,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Segment</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -789,6 +870,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Strand</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -798,6 +880,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Response</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -807,6 +890,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Stimulus</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -816,6 +900,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Event Chain</em>' class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -825,6 +910,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -834,6 +920,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -843,6 +930,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -852,6 +940,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -861,6 +950,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Is State Changed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -870,6 +960,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Event</em>' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -879,6 +970,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -888,6 +980,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -897,6 +990,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -906,6 +1000,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -915,6 +1010,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -924,6 +1020,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -933,6 +1030,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -942,6 +1040,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -951,6 +1050,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Variation</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -960,6 +1060,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Design Function Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -969,6 +1070,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Design Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -978,6 +1080,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Design Function Prototype</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -987,6 +1090,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Execution Time Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -996,6 +1100,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1005,6 +1110,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1014,6 +1120,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1023,6 +1130,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1032,6 +1140,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1041,6 +1150,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1050,6 +1160,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1059,6 +1170,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1068,6 +1180,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Successive</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1077,6 +1190,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Preceding</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1086,6 +1200,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Dependency</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1095,6 +1210,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Successive path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1104,6 +1220,7 @@ public interface TimingPackage extends EPackage {
 	 * The feature id for the '<em><b>Preceding path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1113,6 +1230,7 @@ public interface TimingPackage extends EPackage {
 	 * The number of structural features of the '<em>Precedence Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1121,6 +1239,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.Event <em>Event</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Event
 	 * @generated
@@ -1130,6 +1249,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.Event#isIsStateChanged <em>Is State Changed</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is State Changed</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Event#isIsStateChanged()
 	 * @see #getEvent()
@@ -1138,8 +1258,7 @@ public interface TimingPackage extends EPackage {
 	EAttribute getEvent_IsStateChanged();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.eastadl.timing.EventChain <em>Event Chain</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.eastadl.timing.EventChain <em>Event Chain</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Event Chain</em>'.
@@ -1151,6 +1270,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.EventChain#getResponse <em>Response</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Response</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.EventChain#getResponse()
 	 * @see #getEventChain()
@@ -1161,6 +1281,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.EventChain#getSegment <em>Segment</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Segment</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.EventChain#getSegment()
 	 * @see #getEventChain()
@@ -1171,6 +1292,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStimulus <em>Stimulus</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Stimulus</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.EventChain#getStimulus()
 	 * @see #getEventChain()
@@ -1181,6 +1303,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.EventChain#getStrand <em>Strand</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Strand</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.EventChain#getStrand()
 	 * @see #getEventChain()
@@ -1192,6 +1315,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint <em>Execution Time Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Execution Time Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint
 	 * @generated
@@ -1199,9 +1323,11 @@ public interface TimingPackage extends EPackage {
 	EClass getExecutionTimeConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType <em>Target Design Function Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType
+	 * <em>Target Design Function Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Design Function Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionType()
 	 * @see #getExecutionTimeConstraint()
@@ -1210,9 +1336,11 @@ public interface TimingPackage extends EPackage {
 	EReference getExecutionTimeConstraint_TargetDesignFunctionType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction <em>Target Design Function</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction
+	 * <em>Target Design Function</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Design Function</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunction()
 	 * @see #getExecutionTimeConstraint()
@@ -1221,9 +1349,11 @@ public interface TimingPackage extends EPackage {
 	EReference getExecutionTimeConstraint_TargetDesignFunction();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype <em>Target Design Function Prototype</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype
+	 * <em>Target Design Function Prototype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Design Function Prototype</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getTargetDesignFunctionPrototype()
 	 * @see #getExecutionTimeConstraint()
@@ -1235,6 +1365,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getVariation <em>Variation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Variation</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint#getVariation()
 	 * @see #getExecutionTimeConstraint()
@@ -1246,6 +1377,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint <em>Precedence Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Precedence Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint
 	 * @generated
@@ -1256,6 +1388,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding <em>Preceding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Preceding</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding()
 	 * @see #getPrecedenceConstraint()
@@ -1264,9 +1397,11 @@ public interface TimingPackage extends EPackage {
 	EReference getPrecedenceConstraint_Preceding();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency <em>Base Dependency</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency
+	 * <em>Base Dependency</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Dependency</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getBase_Dependency()
 	 * @see #getPrecedenceConstraint()
@@ -1275,9 +1410,11 @@ public interface TimingPackage extends EPackage {
 	EReference getPrecedenceConstraint_Base_Dependency();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive_path <em>Successive path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive_path
+	 * <em>Successive path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Successive path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive_path()
 	 * @see #getPrecedenceConstraint()
@@ -1286,9 +1423,11 @@ public interface TimingPackage extends EPackage {
 	EReference getPrecedenceConstraint_Successive_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding_path <em>Preceding path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding_path
+	 * <em>Preceding path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Preceding path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getPreceding_path()
 	 * @see #getPrecedenceConstraint()
@@ -1297,9 +1436,11 @@ public interface TimingPackage extends EPackage {
 	EReference getPrecedenceConstraint_Preceding_path();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive <em>Successive</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive
+	 * <em>Successive</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Successive</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint#getSuccessive()
 	 * @see #getPrecedenceConstraint()
@@ -1311,6 +1452,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration <em>Time Duration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Time Duration</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration
 	 * @generated
@@ -1321,6 +1463,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getBase_DataType <em>Base Data Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Data Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration#getBase_DataType()
 	 * @see #getTimeDuration()
@@ -1332,6 +1475,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCode <em>Cse Code</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cse Code</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCode()
 	 * @see #getTimeDuration()
@@ -1343,6 +1487,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCodeFactor <em>Cse Code Factor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Cse Code Factor</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration#getCseCodeFactor()
 	 * @see #getTimeDuration()
@@ -1354,6 +1499,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.TimeDuration#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration#getValue()
 	 * @see #getTimeDuration()
@@ -1364,6 +1510,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.Timing <em>Timing</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Timing</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Timing
 	 * @generated
@@ -1371,8 +1518,10 @@ public interface TimingPackage extends EPackage {
 	EClass getTiming();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingConstraint <em>Timing Constraint</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingConstraint
+	 * <em>Timing Constraint</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Timing Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Timing#getTimingConstraint()
 	 * @see #getTiming()
@@ -1381,8 +1530,10 @@ public interface TimingPackage extends EPackage {
 	EReference getTiming_TimingConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingDescription <em>Timing Description</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.Timing#getTimingDescription
+	 * <em>Timing Description</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Timing Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Timing#getTimingDescription()
 	 * @see #getTiming()
@@ -1394,6 +1545,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Timing#getBase_Class()
 	 * @see #getTiming()
@@ -1405,6 +1557,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.Timing#getBase_Package <em>Base Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Package</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.Timing#getBase_Package()
 	 * @see #getTiming()
@@ -1415,6 +1568,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint <em>Constraint</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint
 	 * @generated
@@ -1425,6 +1579,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getLower <em>Lower</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Lower</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint#getLower()
 	 * @see #getTimingConstraint()
@@ -1436,6 +1591,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Class()
 	 * @see #getTimingConstraint()
@@ -1444,9 +1600,11 @@ public interface TimingPackage extends EPackage {
 	EReference getTimingConstraint_Base_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint <em>Base Constraint</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint
+	 * <em>Base Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint#getBase_Constraint()
 	 * @see #getTimingConstraint()
@@ -1457,6 +1615,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getMode <em>Mode</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Mode</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint#getMode()
 	 * @see #getTimingConstraint()
@@ -1468,6 +1627,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingConstraint#getUpper <em>Upper</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Upper</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint#getUpper()
 	 * @see #getTimingConstraint()
@@ -1478,6 +1638,7 @@ public interface TimingPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.TimingDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Description</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingDescription
 	 * @generated
@@ -1488,6 +1649,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.TimingDescription#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Base Class</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingDescription#getBase_Class()
 	 * @see #getTimingDescription()
@@ -1499,6 +1661,7 @@ public interface TimingPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunction.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunction.java
index a79a3fb9953..5e26846655f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunction.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunction.java
@@ -25,9 +25,12 @@ import org.eclipse.papyrus.eastadl.timing.Event;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Event Function</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * An event of a Function refers to the triggering of the Function, i.e., when the input data is consumed, data transformation is performed on that input data by the function, and output data is produced. It is used in conjunction with FunctionTrigger (see that concept) to define a time-driven triggering for a function. In this case the FunctionTrigger points to the EventFunction of the function and defines a triggerPolicy set to TIME. The timing constraint associated to the EventFunction provides information about the period. 
+ * An event of a Function refers to the triggering of the Function, i.e., when the input data is consumed, data transformation is performed on that
+ * input data by the function, and output data is produced. It is used in conjunction with FunctionTrigger (see that concept) to define a time-driven
+ * triggering for a function. In this case the FunctionTrigger points to the EventFunction of the function and defines a triggerPolicy set to TIME.
+ * The timing constraint associated to the EventFunction provides information about the period.
  * 
  * Compare categories of AUTOSAR runnables:
  * 
@@ -39,29 +42,30 @@ import org.eclipse.papyrus.eastadl.timing.Event;
  * Constraints:
  * [1] An EventFunction either identifies a FunctionType or a FunctionPrototype as its target function.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction <em>Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType <em>Function Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction_path <em>Function path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType <em>Function Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction_path <em>Function path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunction()
  * @model
  * @generated
  */
 public interface EventFunction extends Event {
+
 	/**
 	 * Returns the value of the '<em><b>Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function</em>' reference.
 	 * @see #setFunction(FunctionPrototype)
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunction_Function()
@@ -74,10 +78,10 @@ public interface EventFunction extends Event {
 	 * Returns the value of the '<em><b>Function Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function Type</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function Type</em>' reference.
 	 * @see #setFunctionType(FunctionType)
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunction_FunctionType()
@@ -90,7 +94,9 @@ public interface EventFunction extends Event {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Function</em>' reference.
 	 * @see #getFunction()
 	 * @generated
 	 */
@@ -100,7 +106,9 @@ public interface EventFunction extends Event {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType <em>Function Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Type</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Function Type</em>' reference.
 	 * @see #getFunctionType()
 	 * @generated
 	 */
@@ -111,10 +119,10 @@ public interface EventFunction extends Event {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Function path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Function path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Function path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunction_Function_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPort.java
index fbcf32a721f..a0dde822f40 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPort.java
@@ -25,39 +25,43 @@ import org.eclipse.papyrus.eastadl.timing.Event;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Event Function Client Server Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * Event that refers to the triggering of the Function at a client/server port, i.e., when the input data is sent / received, or when the output data is produced / received.
+ * Event that refers to the triggering of the Function at a client/server port, i.e., when the input data is sent / received, or when the output data
+ * is produced / received.
  * 
  * Constraints:
- * [1] eventKind is sentRequest or receivedResponse for a FunctionClientServerPort of type client. Rationale: Only these values make sense for client ports.
+ * [1] eventKind is sentRequest or receivedResponse for a FunctionClientServerPort of type client. Rationale: Only these values make sense for client
+ * ports.
  * 
- * [2] eventKind is receivedRequest or sentResponse for a FunctionClientServerPort of type server. Rationale: Only these values make sense for server ports.
+ * [2] eventKind is receivedRequest or sentResponse for a FunctionClientServerPort of type server. Rationale: Only these values make sense for server
+ * ports.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind <em>Event Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort_path <em>Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind <em>Event Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort_path <em>Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionClientServerPort()
  * @model
  * @generated
  */
 public interface EventFunctionClientServerPort extends Event {
+
 	/**
 	 * Returns the value of the '<em><b>Event Kind</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Event Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Event Kind</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Event Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
 	 * @see #setEventKind(EventFunctionClientServerPortKind)
@@ -71,10 +75,10 @@ public interface EventFunctionClientServerPort extends Event {
 	 * Returns the value of the '<em><b>Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference.
 	 * @see #setPort(FunctionClientServerPort)
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionClientServerPort_Port()
@@ -84,10 +88,13 @@ public interface EventFunctionClientServerPort extends Event {
 	FunctionClientServerPort getPort();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind <em>Event Kind</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind <em>Event Kind</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event Kind</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Event Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
 	 * @see #getEventKind()
 	 * @generated
@@ -98,7 +105,9 @@ public interface EventFunctionClientServerPort extends Event {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort <em>Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Port</em>' reference.
 	 * @see #getPort()
 	 * @generated
 	 */
@@ -109,10 +118,10 @@ public interface EventFunctionClientServerPort extends Event {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionClientServerPort_Port_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPortKind.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPortKind.java
index 34618110af1..42e7b460271 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPortKind.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionClientServerPortKind.java
@@ -29,9 +29,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->
  * Possible values of eventKind.
  * 
- * Extension: 
+ * Extension:
  * Enumeration, no extension.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionClientServerPortKind()
  * @model
  * @generated
@@ -41,6 +42,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Received Request</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECEIVED_REQUEST_VALUE
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Sent Response</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SENT_RESPONSE_VALUE
 	 * @generated
 	 * @ordered
@@ -61,6 +64,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Sent Request</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SENT_REQUEST_VALUE
 	 * @generated
 	 * @ordered
@@ -71,6 +75,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Received Response</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECEIVED_RESPONSE_VALUE
 	 * @generated
 	 * @ordered
@@ -81,10 +86,10 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Received Request</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Received Request</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Received Request</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECEIVED_REQUEST
 	 * @model name="receivedRequest"
 	 * @generated
@@ -96,10 +101,10 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Sent Response</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Sent Response</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Sent Response</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SENT_RESPONSE
 	 * @model name="sentResponse"
 	 * @generated
@@ -111,10 +116,10 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Sent Request</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Sent Request</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Sent Request</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SENT_REQUEST
 	 * @model name="sentRequest"
 	 * @generated
@@ -126,10 +131,10 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * The '<em><b>Received Response</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Received Response</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Received Response</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECEIVED_RESPONSE
 	 * @model name="receivedResponse"
 	 * @generated
@@ -141,20 +146,16 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * An array of all the '<em><b>Event Function Client Server Port Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final EventFunctionClientServerPortKind[] VALUES_ARRAY =
-		new EventFunctionClientServerPortKind[] {
-			RECEIVED_REQUEST,
-			SENT_RESPONSE,
-			SENT_REQUEST,
-			RECEIVED_RESPONSE,
-		};
+	private static final EventFunctionClientServerPortKind[] VALUES_ARRAY = new EventFunctionClientServerPortKind[]{ RECEIVED_REQUEST, SENT_RESPONSE, SENT_REQUEST, RECEIVED_RESPONSE, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Event Function Client Server Port Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<EventFunctionClientServerPortKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -163,14 +164,19 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * Returns the '<em><b>Event Function Client Server Port Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EventFunctionClientServerPortKind get(int value) {
-		switch (value) {
-			case RECEIVED_REQUEST_VALUE: return RECEIVED_REQUEST;
-			case SENT_RESPONSE_VALUE: return SENT_RESPONSE;
-			case SENT_REQUEST_VALUE: return SENT_REQUEST;
-			case RECEIVED_RESPONSE_VALUE: return RECEIVED_RESPONSE;
+		switch(value) {
+		case RECEIVED_REQUEST_VALUE:
+			return RECEIVED_REQUEST;
+		case SENT_RESPONSE_VALUE:
+			return SENT_RESPONSE;
+		case SENT_REQUEST_VALUE:
+			return SENT_REQUEST;
+		case RECEIVED_RESPONSE_VALUE:
+			return RECEIVED_RESPONSE;
 		}
 		return null;
 	}
@@ -179,12 +185,13 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * Returns the '<em><b>Event Function Client Server Port Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EventFunctionClientServerPortKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			EventFunctionClientServerPortKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -195,12 +202,13 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * Returns the '<em><b>Event Function Client Server Port Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EventFunctionClientServerPortKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			EventFunctionClientServerPortKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -210,6 +218,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -217,6 +226,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -224,6 +234,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -232,6 +243,7 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EventFunctionClientServerPortKind(int value, String name, String literal) {
@@ -243,39 +255,43 @@ public enum EventFunctionClientServerPortKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
+
 } //EventFunctionClientServerPortKind
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionFlowPort.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionFlowPort.java
index 397dd994fbe..fbd29a5b50e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionFlowPort.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventFunctionFlowPort.java
@@ -25,32 +25,33 @@ import org.eclipse.papyrus.eastadl.timing.Event;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Event Function Flow Port</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Event that refers to the triggering of the Function at a flow port, i.e., when data is sent or received.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort_path <em>Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort_path <em>Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionFlowPort()
  * @model
  * @generated
  */
 public interface EventFunctionFlowPort extends Event {
+
 	/**
 	 * Returns the value of the '<em><b>Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port</em>' reference.
 	 * @see #setPort(FunctionPort)
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionFlowPort_Port()
@@ -63,7 +64,9 @@ public interface EventFunctionFlowPort extends Event {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort <em>Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Port</em>' reference.
 	 * @see #getPort()
 	 * @generated
 	 */
@@ -74,10 +77,10 @@ public interface EventFunctionFlowPort extends Event {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionPrototype}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Port path</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Port path</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Port path</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#getEventFunctionFlowPort_Port_path()
 	 * @model
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsFactory.java
index e126fbf9201..31b5bac975d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage
  * @generated
  */
 public interface EventsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	EventsFactory eINSTANCE = org.eclipse.papyrus.eastadl.timing.events.impl.EventsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface EventsFactory extends EFactory {
 	 * Returns a new object of class '<em>Event Function</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Event Function</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface EventsFactory extends EFactory {
 	 * Returns a new object of class '<em>Event Function Client Server Port</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Event Function Client Server Port</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface EventsFactory extends EFactory {
 	 * Returns a new object of class '<em>Event Function Flow Port</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Event Function Flow Port</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface EventsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsPackage.java
index 95dac963f71..80e3790ffc2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/EventsPackage.java
@@ -28,37 +28,43 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * This section describes the concept of events for EAST-ADL2.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsFactory
  * @model kind="package"
  * @generated
  */
 public interface EventsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl <em>Event Function Flow Port</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl
+		 * <em>Event Function Flow Port</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionFlowPort()
 		 * @generated
@@ -69,6 +75,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION_FLOW_PORT__PORT = eINSTANCE.getEventFunctionFlowPort_Port();
@@ -77,14 +84,17 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION_FLOW_PORT__PORT_PATH = eINSTANCE.getEventFunctionFlowPort_Port_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl <em>Event Function Client Server Port</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl
+		 * <em>Event Function Client Server Port</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionClientServerPort()
 		 * @generated
@@ -95,6 +105,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Event Kind</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND = eINSTANCE.getEventFunctionClientServerPort_EventKind();
@@ -103,6 +114,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT = eINSTANCE.getEventFunctionClientServerPort_Port();
@@ -111,6 +123,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Port path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH = eINSTANCE.getEventFunctionClientServerPort_Port_path();
@@ -119,6 +132,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl <em>Event Function</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunction()
 		 * @generated
@@ -129,6 +143,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION__FUNCTION = eINSTANCE.getEventFunction_Function();
@@ -137,6 +152,7 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION__FUNCTION_TYPE = eINSTANCE.getEventFunction_FunctionType();
@@ -145,14 +161,17 @@ public interface EventsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Function path</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_FUNCTION__FUNCTION_PATH = eINSTANCE.getEventFunction_Function_path();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind <em>Event Function Client Server Port Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
+		 * <em>Event Function Client Server Port Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
 		 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionClientServerPortKind()
 		 * @generated
@@ -165,6 +184,7 @@ public interface EventsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "events";
@@ -173,6 +193,7 @@ public interface EventsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Timing/Events/1";
@@ -181,6 +202,7 @@ public interface EventsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "Events";
@@ -189,14 +211,17 @@ public interface EventsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	EventsPackage eINSTANCE = org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl <em>Event Function Flow Port</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl <em>Event Function Flow Port</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionFlowPort()
 	 * @generated
@@ -207,6 +232,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -216,6 +242,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -225,6 +252,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -234,6 +262,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -243,6 +272,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Is State Changed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -252,6 +282,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -261,6 +292,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Port path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -270,15 +302,18 @@ public interface EventsPackage extends EPackage {
 	 * The number of structural features of the '<em>Event Function Flow Port</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EVENT_FUNCTION_FLOW_PORT_FEATURE_COUNT = TimingPackage.EVENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl <em>Event Function Client Server Port</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl
+	 * <em>Event Function Client Server Port</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionClientServerPort()
 	 * @generated
@@ -289,6 +324,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -298,6 +334,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -307,6 +344,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -316,6 +354,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -325,6 +364,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Is State Changed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -334,6 +374,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event Kind</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -343,6 +384,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Port</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -352,6 +394,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Port path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -361,6 +404,7 @@ public interface EventsPackage extends EPackage {
 	 * The number of structural features of the '<em>Event Function Client Server Port</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -370,6 +414,7 @@ public interface EventsPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl <em>Event Function</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunction()
 	 * @generated
@@ -380,6 +425,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -389,6 +435,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -398,6 +445,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -407,6 +455,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -416,6 +465,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Is State Changed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -425,6 +475,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Function</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -434,6 +485,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Function Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -443,6 +495,7 @@ public interface EventsPackage extends EPackage {
 	 * The feature id for the '<em><b>Function path</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -452,15 +505,18 @@ public interface EventsPackage extends EPackage {
 	 * The number of structural features of the '<em>Event Function</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EVENT_FUNCTION_FEATURE_COUNT = TimingPackage.EVENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind <em>Event Function Client Server Port Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
+	 * <em>Event Function Client Server Port Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
 	 * @see org.eclipse.papyrus.eastadl.timing.events.impl.EventsPackageImpl#getEventFunctionClientServerPortKind()
 	 * @generated
@@ -471,6 +527,7 @@ public interface EventsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction <em>Event Function</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Event Function</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunction
 	 * @generated
@@ -481,6 +538,7 @@ public interface EventsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction <em>Function</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Function</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction()
 	 * @see #getEventFunction()
@@ -489,9 +547,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunction_Function();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType <em>Function Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType
+	 * <em>Function Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Function Type</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunctionType()
 	 * @see #getEventFunction()
@@ -500,9 +560,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunction_FunctionType();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction_path <em>Function path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction_path
+	 * <em>Function path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Function path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunction#getFunction_path()
 	 * @see #getEventFunction()
@@ -511,9 +573,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunction_Function_path();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort <em>Event Function Client Server Port</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort
+	 * <em>Event Function Client Server Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Event Function Client Server Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort
 	 * @generated
@@ -521,9 +585,11 @@ public interface EventsPackage extends EPackage {
 	EClass getEventFunctionClientServerPort();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind <em>Event Kind</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind
+	 * <em>Event Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Event Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getEventKind()
 	 * @see #getEventFunctionClientServerPort()
@@ -532,9 +598,11 @@ public interface EventsPackage extends EPackage {
 	EAttribute getEventFunctionClientServerPort_EventKind();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort <em>Port</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort
+	 * <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort()
 	 * @see #getEventFunctionClientServerPort()
@@ -543,9 +611,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunctionClientServerPort_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort_path <em>Port path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort_path
+	 * <em>Port path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort#getPort_path()
 	 * @see #getEventFunctionClientServerPort()
@@ -554,9 +624,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunctionClientServerPort_Port_path();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind <em>Event Function Client Server Port Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
+	 * <em>Event Function Client Server Port Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Event Function Client Server Port Kind</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind
 	 * @generated
@@ -567,6 +639,7 @@ public interface EventsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort <em>Event Function Flow Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Event Function Flow Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort
 	 * @generated
@@ -577,6 +650,7 @@ public interface EventsPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort <em>Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Port</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort()
 	 * @see #getEventFunctionFlowPort()
@@ -585,9 +659,11 @@ public interface EventsPackage extends EPackage {
 	EReference getEventFunctionFlowPort_Port();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort_path <em>Port path</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort_path
+	 * <em>Port path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Port path</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort#getPort_path()
 	 * @see #getEventFunctionFlowPort()
@@ -599,6 +675,7 @@ public interface EventsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionClientServerPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionClientServerPortImpl.java
index adb923eb6d5..f9995e2210f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionClientServerPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionClientServerPortImpl.java
@@ -38,19 +38,21 @@ import org.eclipse.papyrus.eastadl.timing.impl.EventImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getEventKind <em>Event Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getPort_path <em>Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getEventKind <em>Event Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionClientServerPortImpl#getPort_path <em>Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EventFunctionClientServerPortImpl extends EventImpl implements EventFunctionClientServerPort {
+
 	/**
 	 * The default value of the '{@link #getEventKind() <em>Event Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEventKind()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	 * The cached value of the '{@link #getEventKind() <em>Event Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEventKind()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	 * The cached value of the '{@link #getPort() <em>Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	 * The cached value of the '{@link #getPort_path() <em>Port path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort_path()
 	 * @generated
 	 * @ordered
@@ -90,6 +95,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventFunctionClientServerPortImpl() {
@@ -99,6 +105,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionClientServerPort basicGetPort() {
@@ -108,18 +115,20 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
-				return getEventKind();
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
-				if (resolve) return getPort();
-				return basicGetPort();
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
-				return getPort_path();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
+			return getEventKind();
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
+			if(resolve)
+				return getPort();
+			return basicGetPort();
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
+			return getPort_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -127,17 +136,18 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
-				return eventKind != EVENT_KIND_EDEFAULT;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
-				return port != null;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
-				return port_path != null && !port_path.isEmpty();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
+			return eventKind != EVENT_KIND_EDEFAULT;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
+			return port != null;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
+			return port_path != null && !port_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -145,22 +155,23 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
-				setEventKind((EventFunctionClientServerPortKind)newValue);
-				return;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
-				setPort((FunctionClientServerPort)newValue);
-				return;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
-				getPort_path().clear();
-				getPort_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
+			setEventKind((EventFunctionClientServerPortKind)newValue);
+			return;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
+			setPort((FunctionClientServerPort)newValue);
+			return;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
+			getPort_path().clear();
+			getPort_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -168,6 +179,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,20 +190,21 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
-				setEventKind(EVENT_KIND_EDEFAULT);
-				return;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
-				setPort((FunctionClientServerPort)null);
-				return;
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
-				getPort_path().clear();
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND:
+			setEventKind(EVENT_KIND_EDEFAULT);
+			return;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT:
+			setPort((FunctionClientServerPort)null);
+			return;
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH:
+			getPort_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -199,6 +212,7 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventFunctionClientServerPortKind getEventKind() {
@@ -208,14 +222,15 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionClientServerPort getPort() {
-		if (port != null && port.eIsProxy()) {
+		if(port != null && port.eIsProxy()) {
 			InternalEObject oldPort = (InternalEObject)port;
 			port = (FunctionClientServerPort)eResolveProxy(oldPort);
-			if (port != oldPort) {
-				if (eNotificationRequired())
+			if(port != oldPort) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT, oldPort, port));
 			}
 		}
@@ -225,34 +240,37 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEventKind(EventFunctionClientServerPortKind newEventKind) {
 		EventFunctionClientServerPortKind oldEventKind = eventKind;
 		eventKind = newEventKind == null ? EVENT_KIND_EDEFAULT : newEventKind;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__EVENT_KIND, oldEventKind, eventKind));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPort(FunctionClientServerPort newPort) {
 		FunctionClientServerPort oldPort = port;
 		port = newPort;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT, oldPort, port));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort_path() {
-		if (port_path == null) {
+		if(port_path == null) {
 			port_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT__PORT_PATH);
 		}
 		return port_path;
@@ -261,11 +279,13 @@ public class EventFunctionClientServerPortImpl extends EventImpl implements Even
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (eventKind: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionFlowPortImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionFlowPortImpl.java
index 58a557f8059..d34a60de0ee 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionFlowPortImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionFlowPortImpl.java
@@ -37,35 +37,41 @@ import org.eclipse.papyrus.eastadl.timing.impl.EventImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl#getPort <em>Port</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl#getPort_path <em>Port path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl#getPort <em>Port</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionFlowPortImpl#getPort_path <em>Port path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctionFlowPort {
+
 	/**
 	 * The cached value of the '{@link #getPort() <em>Port</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort()
 	 * @generated
 	 * @ordered
 	 */
 	protected FunctionPort port;
+
 	/**
 	 * The cached value of the '{@link #getPort_path() <em>Port path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPort_path()
 	 * @generated
 	 * @ordered
 	 */
 	protected EList<FunctionPrototype> port_path;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventFunctionFlowPortImpl() {
@@ -75,6 +81,7 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPort basicGetPort() {
@@ -84,16 +91,18 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
-				if (resolve) return getPort();
-				return basicGetPort();
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
-				return getPort_path();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
+			if(resolve)
+				return getPort();
+			return basicGetPort();
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
+			return getPort_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -101,15 +110,16 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
-				return port != null;
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
-				return port_path != null && !port_path.isEmpty();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
+			return port != null;
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
+			return port_path != null && !port_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -117,19 +127,20 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
-				setPort((FunctionPort)newValue);
-				return;
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
-				getPort_path().clear();
-				getPort_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
+			setPort((FunctionPort)newValue);
+			return;
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
+			getPort_path().clear();
+			getPort_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -137,6 +148,7 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,17 +159,18 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
-				setPort((FunctionPort)null);
-				return;
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
-				getPort_path().clear();
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT:
+			setPort((FunctionPort)null);
+			return;
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH:
+			getPort_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -165,14 +178,15 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPort getPort() {
-		if (port != null && port.eIsProxy()) {
+		if(port != null && port.eIsProxy()) {
 			InternalEObject oldPort = (InternalEObject)port;
 			port = (FunctionPort)eResolveProxy(oldPort);
-			if (port != oldPort) {
-				if (eNotificationRequired())
+			if(port != oldPort) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT, oldPort, port));
 			}
 		}
@@ -182,22 +196,24 @@ public class EventFunctionFlowPortImpl extends EventImpl implements EventFunctio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPort(FunctionPort newPort) {
 		FunctionPort oldPort = port;
 		port = newPort;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT, oldPort, port));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPort_path() {
-		if (port_path == null) {
+		if(port_path == null) {
 			port_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, EventsPackage.EVENT_FUNCTION_FLOW_PORT__PORT_PATH);
 		}
 		return port_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionImpl.java
index 61656db5dda..f33446d6cc2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventFunctionImpl.java
@@ -37,19 +37,21 @@ import org.eclipse.papyrus.eastadl.timing.impl.EventImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunction <em>Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunctionType <em>Function Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunction_path <em>Function path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunction <em>Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunctionType <em>Function Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.events.impl.EventFunctionImpl#getFunction_path <em>Function path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EventFunctionImpl extends EventImpl implements EventFunction {
+
 	/**
 	 * The cached value of the '{@link #getFunction() <em>Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunction()
 	 * @generated
 	 * @ordered
@@ -60,6 +62,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	 * The cached value of the '{@link #getFunctionType() <em>Function Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunctionType()
 	 * @generated
 	 * @ordered
@@ -70,6 +73,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	 * The cached value of the '{@link #getFunction_path() <em>Function path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFunction_path()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventFunctionImpl() {
@@ -88,6 +93,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype basicGetFunction() {
@@ -97,6 +103,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType basicGetFunctionType() {
@@ -106,19 +113,22 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION__FUNCTION:
-				if (resolve) return getFunction();
-				return basicGetFunction();
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
-				if (resolve) return getFunctionType();
-				return basicGetFunctionType();
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
-				return getFunction_path();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION__FUNCTION:
+			if(resolve)
+				return getFunction();
+			return basicGetFunction();
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
+			if(resolve)
+				return getFunctionType();
+			return basicGetFunctionType();
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
+			return getFunction_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -126,17 +136,18 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION__FUNCTION:
-				return function != null;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
-				return functionType != null;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
-				return function_path != null && !function_path.isEmpty();
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION__FUNCTION:
+			return function != null;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
+			return functionType != null;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
+			return function_path != null && !function_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -144,22 +155,23 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION__FUNCTION:
-				setFunction((FunctionPrototype)newValue);
-				return;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
-				setFunctionType((FunctionType)newValue);
-				return;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
-				getFunction_path().clear();
-				getFunction_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION__FUNCTION:
+			setFunction((FunctionPrototype)newValue);
+			return;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
+			setFunctionType((FunctionType)newValue);
+			return;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
+			getFunction_path().clear();
+			getFunction_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -167,6 +179,7 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,20 +190,21 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EventsPackage.EVENT_FUNCTION__FUNCTION:
-				setFunction((FunctionPrototype)null);
-				return;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
-				setFunctionType((FunctionType)null);
-				return;
-			case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
-				getFunction_path().clear();
-				return;
+		switch(featureID) {
+		case EventsPackage.EVENT_FUNCTION__FUNCTION:
+			setFunction((FunctionPrototype)null);
+			return;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE:
+			setFunctionType((FunctionType)null);
+			return;
+		case EventsPackage.EVENT_FUNCTION__FUNCTION_PATH:
+			getFunction_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -198,14 +212,15 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype getFunction() {
-		if (function != null && function.eIsProxy()) {
+		if(function != null && function.eIsProxy()) {
 			InternalEObject oldFunction = (InternalEObject)function;
 			function = (FunctionPrototype)eResolveProxy(oldFunction);
-			if (function != oldFunction) {
-				if (eNotificationRequired())
+			if(function != oldFunction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EventsPackage.EVENT_FUNCTION__FUNCTION, oldFunction, function));
 			}
 		}
@@ -215,14 +230,15 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionType getFunctionType() {
-		if (functionType != null && functionType.eIsProxy()) {
+		if(functionType != null && functionType.eIsProxy()) {
 			InternalEObject oldFunctionType = (InternalEObject)functionType;
 			functionType = (FunctionType)eResolveProxy(oldFunctionType);
-			if (functionType != oldFunctionType) {
-				if (eNotificationRequired())
+			if(functionType != oldFunctionType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE, oldFunctionType, functionType));
 			}
 		}
@@ -232,34 +248,37 @@ public class EventFunctionImpl extends EventImpl implements EventFunction {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunction(FunctionPrototype newFunction) {
 		FunctionPrototype oldFunction = function;
 		function = newFunction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EventsPackage.EVENT_FUNCTION__FUNCTION, oldFunction, function));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFunctionType(FunctionType newFunctionType) {
 		FunctionType oldFunctionType = functionType;
 		functionType = newFunctionType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, EventsPackage.EVENT_FUNCTION__FUNCTION_TYPE, oldFunctionType, functionType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getFunction_path() {
-		if (function_path == null) {
+		if(function_path == null) {
 			function_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, EventsPackage.EVENT_FUNCTION__FUNCTION_PATH);
 		}
 		return function_path;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsFactoryImpl.java
index aa81843b0d7..b48710f3ec8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsFactoryImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.timing.events.*;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunction;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPortKind;
@@ -33,12 +34,15 @@ import org.eclipse.papyrus.eastadl.timing.events.EventsPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -51,16 +55,16 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static EventsFactory init() {
 		try {
 			EventsFactory theEventsFactory = (EventsFactory)EPackage.Registry.INSTANCE.getEFactory(EventsPackage.eNS_URI);
-			if (theEventsFactory != null) {
+			if(theEventsFactory != null) {
 				return theEventsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new EventsFactoryImpl();
@@ -70,6 +74,7 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsFactoryImpl() {
@@ -79,6 +84,7 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertEventFunctionClientServerPortKindToString(EDataType eDataType, Object instanceValue) {
@@ -88,37 +94,43 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT_KIND:
-				return convertEventFunctionClientServerPortKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT_KIND:
+			return convertEventFunctionClientServerPortKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT: return createEventFunctionFlowPort();
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT: return createEventFunctionClientServerPort();
-			case EventsPackage.EVENT_FUNCTION: return createEventFunction();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT:
+			return createEventFunctionFlowPort();
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT:
+			return createEventFunctionClientServerPort();
+		case EventsPackage.EVENT_FUNCTION:
+			return createEventFunction();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventFunction createEventFunction() {
@@ -129,6 +141,7 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventFunctionClientServerPort createEventFunctionClientServerPort() {
@@ -139,17 +152,20 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventFunctionClientServerPortKind createEventFunctionClientServerPortKindFromString(EDataType eDataType, String initialValue) {
 		EventFunctionClientServerPortKind result = EventFunctionClientServerPortKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventFunctionFlowPort createEventFunctionFlowPort() {
@@ -160,21 +176,23 @@ public class EventsFactoryImpl extends EFactoryImpl implements EventsFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT_KIND:
-				return createEventFunctionClientServerPortKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT_KIND:
+			return createEventFunctionClientServerPortKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsPackage getEventsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsPackageImpl.java
index 56379d05419..5538c7ab924 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/impl/EventsPackageImpl.java
@@ -87,6 +87,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
@@ -94,6 +95,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventFunctionFlowPortEClass = null;
@@ -101,6 +103,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventFunctionClientServerPortEClass = null;
@@ -108,6 +111,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventFunctionEClass = null;
@@ -115,6 +119,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum eventFunctionClientServerPortKindEEnum = null;
@@ -122,6 +127,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -129,16 +135,18 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * 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 EventsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link EventsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static EventsPackage init() {
-		if (isInited) return (EventsPackage)EPackage.Registry.INSTANCE.getEPackage(EventsPackage.eNS_URI);
+		if(isInited)
+			return (EventsPackage)EPackage.Registry.INSTANCE.getEPackage(EventsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		EventsPackageImpl theEventsPackage = (EventsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EventsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EventsPackageImpl());
@@ -240,7 +248,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 		// Mark meta-data to indicate it can't be changed
 		theEventsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(EventsPackage.eNS_URI, theEventsPackage);
 		return theEventsPackage;
@@ -249,6 +257,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -256,19 +265,19 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage#eNS_URI
 	 * @see #init()
@@ -279,14 +288,16 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -311,6 +322,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEventFunction() {
@@ -320,6 +332,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunction_Function() {
@@ -329,6 +342,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunction_FunctionType() {
@@ -338,6 +352,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunction_Function_path() {
@@ -347,6 +362,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEventFunctionClientServerPort() {
@@ -356,6 +372,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEventFunctionClientServerPort_EventKind() {
@@ -365,6 +382,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunctionClientServerPort_Port() {
@@ -374,6 +392,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunctionClientServerPort_Port_path() {
@@ -383,6 +402,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getEventFunctionClientServerPortKind() {
@@ -392,6 +412,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEventFunctionFlowPort() {
@@ -401,6 +422,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunctionFlowPort_Port() {
@@ -410,6 +432,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventFunctionFlowPort_Port_path() {
@@ -419,6 +442,7 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsFactory getEventsFactory() {
@@ -426,14 +450,16 @@ public class EventsPackageImpl extends EPackageImpl implements EventsPackage {
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsAdapterFactory.java
index 68df07a11de..17ebf6f2902 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsAdapterFactory.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 import org.eclipse.papyrus.eastadl.timing.Event;
 import org.eclipse.papyrus.eastadl.timing.TimingDescription;
+import org.eclipse.papyrus.eastadl.timing.events.*;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunction;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort;
@@ -33,14 +34,17 @@ import org.eclipse.papyrus.eastadl.timing.events.EventsPackage;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage
  * @generated
  */
 public class EventsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static EventsPackage modelPackage;
@@ -49,48 +53,56 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected EventsSwitch<Adapter> modelSwitch =
-		new EventsSwitch<Adapter>() {
-			@Override
-			public Adapter caseEventFunctionFlowPort(EventFunctionFlowPort object) {
-				return createEventFunctionFlowPortAdapter();
-			}
-			@Override
-			public Adapter caseEventFunctionClientServerPort(EventFunctionClientServerPort object) {
-				return createEventFunctionClientServerPortAdapter();
-			}
-			@Override
-			public Adapter caseEventFunction(EventFunction object) {
-				return createEventFunctionAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseTimingDescription(TimingDescription object) {
-				return createTimingDescriptionAdapter();
-			}
-			@Override
-			public Adapter caseEvent(Event object) {
-				return createEventAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected EventsSwitch<Adapter> modelSwitch = new EventsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseEventFunctionFlowPort(EventFunctionFlowPort object) {
+			return createEventFunctionFlowPortAdapter();
+		}
+
+		@Override
+		public Adapter caseEventFunctionClientServerPort(EventFunctionClientServerPort object) {
+			return createEventFunctionClientServerPortAdapter();
+		}
+
+		@Override
+		public Adapter caseEventFunction(EventFunction object) {
+			return createEventFunctionAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTimingDescription(TimingDescription object) {
+			return createTimingDescriptionAdapter();
+		}
+
+		@Override
+		public Adapter caseEvent(Event object) {
+			return createEventAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = EventsPackage.eINSTANCE;
 		}
 	}
@@ -99,7 +111,9 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -113,6 +127,7 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -126,6 +141,7 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.Event
 	 * @generated
@@ -140,6 +156,7 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunction
 	 * @generated
@@ -154,6 +171,7 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -163,11 +181,13 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort <em>Event Function Client Server Port</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort
+	 * <em>Event Function Client Server Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort
 	 * @generated
@@ -177,11 +197,13 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort <em>Event Function Flow Port</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort
+	 * <em>Event Function Flow Port</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort
 	 * @generated
@@ -196,6 +218,7 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingDescription
 	 * @generated
@@ -209,15 +232,16 @@ public class EventsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceFactoryImpl.java
index 598693dda1b..e84db4dab95 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.util.EventsResourceImpl
  * @generated
  */
 public class EventsResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class EventsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceImpl.java
index 862ab4a49e4..3138886ff6c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.util.EventsResourceFactoryImpl
  * @generated
  */
 public class EventsResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public EventsResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsSwitch.java
index 4846c787168..9f26136ea3d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsSwitch.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 import org.eclipse.papyrus.eastadl.timing.Event;
 import org.eclipse.papyrus.eastadl.timing.TimingDescription;
+import org.eclipse.papyrus.eastadl.timing.events.*;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunction;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionClientServerPort;
 import org.eclipse.papyrus.eastadl.timing.events.EventFunctionFlowPort;
@@ -30,21 +31,23 @@ import org.eclipse.papyrus.eastadl.timing.events.EventsPackage;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.events.EventsPackage
  * @generated
  */
 public class EventsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static EventsPackage modelPackage;
@@ -53,10 +56,11 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = EventsPackage.eINSTANCE;
 		}
 	}
@@ -65,6 +69,7 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -80,7 +85,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -95,7 +102,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event Function</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -110,7 +119,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -125,7 +136,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event Function Client Server Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -140,7 +153,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event Function Flow Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -155,7 +170,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Description</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -170,7 +187,9 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -184,40 +203,57 @@ public class EventsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case EventsPackage.EVENT_FUNCTION_FLOW_PORT: {
-				EventFunctionFlowPort eventFunctionFlowPort = (EventFunctionFlowPort)theEObject;
-				T result = caseEventFunctionFlowPort(eventFunctionFlowPort);
-				if (result == null) result = caseEvent(eventFunctionFlowPort);
-				if (result == null) result = caseTimingDescription(eventFunctionFlowPort);
-				if (result == null) result = caseEAElement(eventFunctionFlowPort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT: {
-				EventFunctionClientServerPort eventFunctionClientServerPort = (EventFunctionClientServerPort)theEObject;
-				T result = caseEventFunctionClientServerPort(eventFunctionClientServerPort);
-				if (result == null) result = caseEvent(eventFunctionClientServerPort);
-				if (result == null) result = caseTimingDescription(eventFunctionClientServerPort);
-				if (result == null) result = caseEAElement(eventFunctionClientServerPort);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EventsPackage.EVENT_FUNCTION: {
-				EventFunction eventFunction = (EventFunction)theEObject;
-				T result = caseEventFunction(eventFunction);
-				if (result == null) result = caseEvent(eventFunction);
-				if (result == null) result = caseTimingDescription(eventFunction);
-				if (result == null) result = caseEAElement(eventFunction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case EventsPackage.EVENT_FUNCTION_FLOW_PORT:
+		{
+			EventFunctionFlowPort eventFunctionFlowPort = (EventFunctionFlowPort)theEObject;
+			T result = caseEventFunctionFlowPort(eventFunctionFlowPort);
+			if(result == null)
+				result = caseEvent(eventFunctionFlowPort);
+			if(result == null)
+				result = caseTimingDescription(eventFunctionFlowPort);
+			if(result == null)
+				result = caseEAElement(eventFunctionFlowPort);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case EventsPackage.EVENT_FUNCTION_CLIENT_SERVER_PORT:
+		{
+			EventFunctionClientServerPort eventFunctionClientServerPort = (EventFunctionClientServerPort)theEObject;
+			T result = caseEventFunctionClientServerPort(eventFunctionClientServerPort);
+			if(result == null)
+				result = caseEvent(eventFunctionClientServerPort);
+			if(result == null)
+				result = caseTimingDescription(eventFunctionClientServerPort);
+			if(result == null)
+				result = caseEAElement(eventFunctionClientServerPort);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case EventsPackage.EVENT_FUNCTION:
+		{
+			EventFunction eventFunction = (EventFunction)theEObject;
+			T result = caseEventFunction(eventFunction);
+			if(result == null)
+				result = caseEvent(eventFunction);
+			if(result == null)
+				result = caseTimingDescription(eventFunction);
+			if(result == null)
+				result = caseEAElement(eventFunction);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsXMLProcessor.java
index b4dcb457455..5299c3a03ae 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/events/util/EventsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.timing.events.EventsPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EventsXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class EventsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventsXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		EventsPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the EventsResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new EventsResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new EventsResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventChainImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventChainImpl.java
index 12c0c9f8808..41a5a78b359 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventChainImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventChainImpl.java
@@ -31,13 +31,13 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getSegment <em>Segment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getStrand <em>Strand</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getResponse <em>Response</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getStimulus <em>Stimulus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getSegment <em>Segment</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getStrand <em>Strand</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getResponse <em>Response</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventChainImpl#getStimulus <em>Stimulus</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EventChainImpl extends TimingDescriptionImpl implements EventChain {
@@ -84,6 +84,7 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventChainImpl() {
@@ -92,72 +93,76 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.EVENT_CHAIN__SEGMENT:
-				return getSegment();
-			case TimingPackage.EVENT_CHAIN__STRAND:
-				return getStrand();
-			case TimingPackage.EVENT_CHAIN__RESPONSE:
-				return getResponse();
-			case TimingPackage.EVENT_CHAIN__STIMULUS:
-				return getStimulus();
+		switch(featureID) {
+		case TimingPackage.EVENT_CHAIN__SEGMENT:
+			return getSegment();
+		case TimingPackage.EVENT_CHAIN__STRAND:
+			return getStrand();
+		case TimingPackage.EVENT_CHAIN__RESPONSE:
+			return getResponse();
+		case TimingPackage.EVENT_CHAIN__STIMULUS:
+			return getStimulus();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EVENT_CHAIN__SEGMENT:
-				return segment != null && !segment.isEmpty();
-			case TimingPackage.EVENT_CHAIN__STRAND:
-				return strand != null && !strand.isEmpty();
-			case TimingPackage.EVENT_CHAIN__RESPONSE:
-				return response != null && !response.isEmpty();
-			case TimingPackage.EVENT_CHAIN__STIMULUS:
-				return stimulus != null && !stimulus.isEmpty();
+		switch(featureID) {
+		case TimingPackage.EVENT_CHAIN__SEGMENT:
+			return segment != null && !segment.isEmpty();
+		case TimingPackage.EVENT_CHAIN__STRAND:
+			return strand != null && !strand.isEmpty();
+		case TimingPackage.EVENT_CHAIN__RESPONSE:
+			return response != null && !response.isEmpty();
+		case TimingPackage.EVENT_CHAIN__STIMULUS:
+			return stimulus != null && !stimulus.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.EVENT_CHAIN__SEGMENT:
-				getSegment().clear();
-				getSegment().addAll((Collection<? extends EventChain>)newValue);
-				return;
-			case TimingPackage.EVENT_CHAIN__STRAND:
-				getStrand().clear();
-				getStrand().addAll((Collection<? extends EventChain>)newValue);
-				return;
-			case TimingPackage.EVENT_CHAIN__RESPONSE:
-				getResponse().clear();
-				getResponse().addAll((Collection<? extends Event>)newValue);
-				return;
-			case TimingPackage.EVENT_CHAIN__STIMULUS:
-				getStimulus().clear();
-				getStimulus().addAll((Collection<? extends Event>)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.EVENT_CHAIN__SEGMENT:
+			getSegment().clear();
+			getSegment().addAll((Collection<? extends EventChain>)newValue);
+			return;
+		case TimingPackage.EVENT_CHAIN__STRAND:
+			getStrand().clear();
+			getStrand().addAll((Collection<? extends EventChain>)newValue);
+			return;
+		case TimingPackage.EVENT_CHAIN__RESPONSE:
+			getResponse().clear();
+			getResponse().addAll((Collection<? extends Event>)newValue);
+			return;
+		case TimingPackage.EVENT_CHAIN__STIMULUS:
+			getStimulus().clear();
+			getStimulus().addAll((Collection<? extends Event>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,33 +172,35 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EVENT_CHAIN__SEGMENT:
-				getSegment().clear();
-				return;
-			case TimingPackage.EVENT_CHAIN__STRAND:
-				getStrand().clear();
-				return;
-			case TimingPackage.EVENT_CHAIN__RESPONSE:
-				getResponse().clear();
-				return;
-			case TimingPackage.EVENT_CHAIN__STIMULUS:
-				getStimulus().clear();
-				return;
+		switch(featureID) {
+		case TimingPackage.EVENT_CHAIN__SEGMENT:
+			getSegment().clear();
+			return;
+		case TimingPackage.EVENT_CHAIN__STRAND:
+			getStrand().clear();
+			return;
+		case TimingPackage.EVENT_CHAIN__RESPONSE:
+			getResponse().clear();
+			return;
+		case TimingPackage.EVENT_CHAIN__STIMULUS:
+			getStimulus().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Event> getResponse() {
-		if (response == null) {
+		if(response == null) {
 			response = new EObjectResolvingEList<Event>(Event.class, this, TimingPackage.EVENT_CHAIN__RESPONSE);
 		}
 		return response;
@@ -201,10 +208,11 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EventChain> getSegment() {
-		if (segment == null) {
+		if(segment == null) {
 			segment = new EObjectResolvingEList<EventChain>(EventChain.class, this, TimingPackage.EVENT_CHAIN__SEGMENT);
 		}
 		return segment;
@@ -212,10 +220,11 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Event> getStimulus() {
-		if (stimulus == null) {
+		if(stimulus == null) {
 			stimulus = new EObjectResolvingEList<Event>(Event.class, this, TimingPackage.EVENT_CHAIN__STIMULUS);
 		}
 		return stimulus;
@@ -223,10 +232,11 @@ public class EventChainImpl extends TimingDescriptionImpl implements EventChain
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EventChain> getStrand() {
-		if (strand == null) {
+		if(strand == null) {
 			strand = new EObjectResolvingEList<EventChain>(EventChain.class, this, TimingPackage.EVENT_CHAIN__STRAND);
 		}
 		return strand;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventImpl.java
index d60c614432b..f1dcaed60c7 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/EventImpl.java
@@ -28,10 +28,10 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventImpl#isIsStateChanged <em>Is State Changed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.EventImpl#isIsStateChanged <em>Is State Changed</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class EventImpl extends TimingDescriptionImpl implements Event {
@@ -39,6 +39,7 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 	/**
 	 * The default value of the '{@link #isIsStateChanged() <em>Is State Changed</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isIsStateChanged()
 	 * @generated
 	 * @ordered
@@ -48,6 +49,7 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 	/**
 	 * The cached value of the '{@link #isIsStateChanged() <em>Is State Changed</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isIsStateChanged()
 	 * @generated
 	 * @ordered
@@ -56,6 +58,7 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventImpl() {
@@ -64,46 +67,50 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.EVENT__IS_STATE_CHANGED:
-				return isIsStateChanged();
+		switch(featureID) {
+		case TimingPackage.EVENT__IS_STATE_CHANGED:
+			return isIsStateChanged();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EVENT__IS_STATE_CHANGED:
-				return isStateChanged != IS_STATE_CHANGED_EDEFAULT;
+		switch(featureID) {
+		case TimingPackage.EVENT__IS_STATE_CHANGED:
+			return isStateChanged != IS_STATE_CHANGED_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.EVENT__IS_STATE_CHANGED:
-				setIsStateChanged((Boolean)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.EVENT__IS_STATE_CHANGED:
+			setIsStateChanged((Boolean)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,6 +121,7 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsStateChanged() {
@@ -123,36 +131,40 @@ public abstract class EventImpl extends TimingDescriptionImpl implements Event {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsStateChanged(boolean newIsStateChanged) {
 		boolean oldIsStateChanged = isStateChanged;
 		isStateChanged = newIsStateChanged;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.EVENT__IS_STATE_CHANGED, oldIsStateChanged, isStateChanged));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EVENT__IS_STATE_CHANGED:
-				setIsStateChanged(IS_STATE_CHANGED_EDEFAULT);
-				return;
+		switch(featureID) {
+		case TimingPackage.EVENT__IS_STATE_CHANGED:
+			setIsStateChanged(IS_STATE_CHANGED_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isStateChanged: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/ExecutionTimeConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/ExecutionTimeConstraintImpl.java
index 9ab6573d9fc..867570b501c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/ExecutionTimeConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/ExecutionTimeConstraintImpl.java
@@ -33,20 +33,23 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getVariation <em>Variation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunctionType <em>Target Design Function Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunction <em>Target Design Function</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunctionPrototype <em>Target Design Function Prototype</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getVariation <em>Variation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunctionType <em>Target Design Function Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunction <em>Target Design Function</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.ExecutionTimeConstraintImpl#getTargetDesignFunctionPrototype <em>Target Design Function
+ * Prototype</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements ExecutionTimeConstraint {
+
 	/**
 	 * The cached value of the '{@link #getVariation() <em>Variation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVariation()
 	 * @generated
 	 * @ordered
@@ -57,6 +60,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	 * The cached value of the '{@link #getTargetDesignFunctionType() <em>Target Design Function Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetDesignFunctionType()
 	 * @generated
 	 * @ordered
@@ -67,6 +71,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	 * The cached value of the '{@link #getTargetDesignFunction() <em>Target Design Function</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetDesignFunction()
 	 * @generated
 	 * @ordered
@@ -77,6 +82,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	 * The cached value of the '{@link #getTargetDesignFunctionPrototype() <em>Target Design Function Prototype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetDesignFunctionPrototype()
 	 * @generated
 	 * @ordered
@@ -86,6 +92,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ExecutionTimeConstraintImpl() {
@@ -95,6 +102,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionType basicGetTargetDesignFunctionType() {
@@ -104,6 +112,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetVariation() {
@@ -113,23 +122,28 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
-				if (resolve) return getVariation();
-				return basicGetVariation();
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
-				if (resolve) return getTargetDesignFunctionType();
-				return basicGetTargetDesignFunctionType();
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
-				if (resolve) return getTargetDesignFunction();
-				return basicGetTargetDesignFunction();
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
-				if (resolve) return getTargetDesignFunctionPrototype();
-				return basicGetTargetDesignFunctionPrototype();
+		switch(featureID) {
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
+			if(resolve)
+				return getVariation();
+			return basicGetVariation();
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
+			if(resolve)
+				return getTargetDesignFunctionType();
+			return basicGetTargetDesignFunctionType();
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
+			if(resolve)
+				return getTargetDesignFunction();
+			return basicGetTargetDesignFunction();
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
+			if(resolve)
+				return getTargetDesignFunctionPrototype();
+			return basicGetTargetDesignFunctionPrototype();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -137,19 +151,20 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
-				return variation != null;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
-				return targetDesignFunctionType != null;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
-				return targetDesignFunction != null;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
-				return targetDesignFunctionPrototype != null;
+		switch(featureID) {
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
+			return variation != null;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
+			return targetDesignFunctionType != null;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
+			return targetDesignFunction != null;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
+			return targetDesignFunctionPrototype != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -157,23 +172,24 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
-				setVariation((TimeDuration)newValue);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
-				setTargetDesignFunctionType((DesignFunctionType)newValue);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
-				setTargetDesignFunction((DesignFunctionType)newValue);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
-				setTargetDesignFunctionPrototype((DesignFunctionPrototype)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
+			setVariation((TimeDuration)newValue);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
+			setTargetDesignFunctionType((DesignFunctionType)newValue);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
+			setTargetDesignFunction((DesignFunctionType)newValue);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
+			setTargetDesignFunctionPrototype((DesignFunctionPrototype)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -181,6 +197,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,23 +208,24 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
-				setVariation((TimeDuration)null);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
-				setTargetDesignFunctionType((DesignFunctionType)null);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
-				setTargetDesignFunction((DesignFunctionType)null);
-				return;
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
-				setTargetDesignFunctionPrototype((DesignFunctionPrototype)null);
-				return;
+		switch(featureID) {
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION:
+			setVariation((TimeDuration)null);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE:
+			setTargetDesignFunctionType((DesignFunctionType)null);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION:
+			setTargetDesignFunction((DesignFunctionType)null);
+			return;
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE:
+			setTargetDesignFunctionPrototype((DesignFunctionPrototype)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -215,14 +233,15 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionType getTargetDesignFunctionType() {
-		if (targetDesignFunctionType != null && targetDesignFunctionType.eIsProxy()) {
+		if(targetDesignFunctionType != null && targetDesignFunctionType.eIsProxy()) {
 			InternalEObject oldTargetDesignFunctionType = (InternalEObject)targetDesignFunctionType;
 			targetDesignFunctionType = (DesignFunctionType)eResolveProxy(oldTargetDesignFunctionType);
-			if (targetDesignFunctionType != oldTargetDesignFunctionType) {
-				if (eNotificationRequired())
+			if(targetDesignFunctionType != oldTargetDesignFunctionType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE, oldTargetDesignFunctionType, targetDesignFunctionType));
 			}
 		}
@@ -232,14 +251,15 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getVariation() {
-		if (variation != null && variation.eIsProxy()) {
+		if(variation != null && variation.eIsProxy()) {
 			InternalEObject oldVariation = (InternalEObject)variation;
 			variation = (TimeDuration)eResolveProxy(oldVariation);
-			if (variation != oldVariation) {
-				if (eNotificationRequired())
+			if(variation != oldVariation) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION, oldVariation, variation));
 			}
 		}
@@ -249,26 +269,28 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetDesignFunctionType(DesignFunctionType newTargetDesignFunctionType) {
 		DesignFunctionType oldTargetDesignFunctionType = targetDesignFunctionType;
 		targetDesignFunctionType = newTargetDesignFunctionType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_TYPE, oldTargetDesignFunctionType, targetDesignFunctionType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionType getTargetDesignFunction() {
-		if (targetDesignFunction != null && targetDesignFunction.eIsProxy()) {
+		if(targetDesignFunction != null && targetDesignFunction.eIsProxy()) {
 			InternalEObject oldTargetDesignFunction = (InternalEObject)targetDesignFunction;
 			targetDesignFunction = (DesignFunctionType)eResolveProxy(oldTargetDesignFunction);
-			if (targetDesignFunction != oldTargetDesignFunction) {
-				if (eNotificationRequired())
+			if(targetDesignFunction != oldTargetDesignFunction) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION, oldTargetDesignFunction, targetDesignFunction));
 			}
 		}
@@ -278,6 +300,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionType basicGetTargetDesignFunction() {
@@ -287,26 +310,28 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetDesignFunction(DesignFunctionType newTargetDesignFunction) {
 		DesignFunctionType oldTargetDesignFunction = targetDesignFunction;
 		targetDesignFunction = newTargetDesignFunction;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION, oldTargetDesignFunction, targetDesignFunction));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionPrototype getTargetDesignFunctionPrototype() {
-		if (targetDesignFunctionPrototype != null && targetDesignFunctionPrototype.eIsProxy()) {
+		if(targetDesignFunctionPrototype != null && targetDesignFunctionPrototype.eIsProxy()) {
 			InternalEObject oldTargetDesignFunctionPrototype = (InternalEObject)targetDesignFunctionPrototype;
 			targetDesignFunctionPrototype = (DesignFunctionPrototype)eResolveProxy(oldTargetDesignFunctionPrototype);
-			if (targetDesignFunctionPrototype != oldTargetDesignFunctionPrototype) {
-				if (eNotificationRequired())
+			if(targetDesignFunctionPrototype != oldTargetDesignFunctionPrototype) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE, oldTargetDesignFunctionPrototype, targetDesignFunctionPrototype));
 			}
 		}
@@ -316,6 +341,7 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DesignFunctionPrototype basicGetTargetDesignFunctionPrototype() {
@@ -325,24 +351,26 @@ public class ExecutionTimeConstraintImpl extends TimingConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetDesignFunctionPrototype(DesignFunctionPrototype newTargetDesignFunctionPrototype) {
 		DesignFunctionPrototype oldTargetDesignFunctionPrototype = targetDesignFunctionPrototype;
 		targetDesignFunctionPrototype = newTargetDesignFunctionPrototype;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.EXECUTION_TIME_CONSTRAINT__TARGET_DESIGN_FUNCTION_PROTOTYPE, oldTargetDesignFunctionPrototype, targetDesignFunctionPrototype));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setVariation(TimeDuration newVariation) {
 		TimeDuration oldVariation = variation;
 		variation = newVariation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.EXECUTION_TIME_CONSTRAINT__VARIATION, oldVariation, variation));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/PrecedenceConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/PrecedenceConstraintImpl.java
index 8ecc8868a00..13a527d23ef 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/PrecedenceConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/PrecedenceConstraintImpl.java
@@ -39,14 +39,14 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getSuccessive <em>Successive</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getPreceding <em>Preceding</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getBase_Dependency <em>Base Dependency</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getSuccessive_path <em>Successive path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getPreceding_path <em>Preceding path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getSuccessive <em>Successive</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getPreceding <em>Preceding</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getBase_Dependency <em>Base Dependency</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getSuccessive_path <em>Successive path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.PrecedenceConstraintImpl#getPreceding_path <em>Preceding path</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PrecedenceConstraintImpl extends TimingConstraintImpl implements PrecedenceConstraint {
@@ -55,6 +55,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Dependency()
 	 * @generated
 	 * @ordered
@@ -65,6 +66,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	 * The cached value of the '{@link #getSuccessive_path() <em>Successive path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSuccessive_path()
 	 * @generated
 	 * @ordered
@@ -75,6 +77,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	 * The cached value of the '{@link #getPreceding_path() <em>Preceding path</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPreceding_path()
 	 * @generated
 	 * @ordered
@@ -83,6 +86,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PrecedenceConstraintImpl() {
@@ -104,8 +108,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 			if(!sources.isEmpty()) {
 				Element current = sources.get(0);
 
-				FunctionPrototype currentFProto = (FunctionPrototype)UMLUtil.getStereotypeApplication(current,
-					FunctionPrototype.class);
+				FunctionPrototype currentFProto = (FunctionPrototype)UMLUtil.getStereotypeApplication(current, FunctionPrototype.class);
 
 				if(currentFProto != null) {
 					preceding = currentFProto;
@@ -119,14 +122,15 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency getBase_Dependency() {
-		if (base_Dependency != null && base_Dependency.eIsProxy()) {
+		if(base_Dependency != null && base_Dependency.eIsProxy()) {
 			InternalEObject oldBase_Dependency = (InternalEObject)base_Dependency;
 			base_Dependency = (Dependency)eResolveProxy(oldBase_Dependency);
-			if (base_Dependency != oldBase_Dependency) {
-				if (eNotificationRequired())
+			if(base_Dependency != oldBase_Dependency) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 			}
 		}
@@ -136,6 +140,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dependency basicGetBase_Dependency() {
@@ -145,22 +150,24 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Dependency(Dependency newBase_Dependency) {
 		Dependency oldBase_Dependency = base_Dependency;
 		base_Dependency = newBase_Dependency;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getSuccessive_path() {
-		if (successive_path == null) {
+		if(successive_path == null) {
 			successive_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH);
 		}
 		return successive_path;
@@ -169,10 +176,11 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FunctionPrototype> getPreceding_path() {
-		if (preceding_path == null) {
+		if(preceding_path == null) {
 			preceding_path = new EObjectResolvingEList<FunctionPrototype>(FunctionPrototype.class, this, TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH);
 		}
 		return preceding_path;
@@ -180,73 +188,79 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE:
-				return getSuccessive();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING:
-				if (resolve) return getPreceding();
-				return basicGetPreceding();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
-				if (resolve) return getBase_Dependency();
-				return basicGetBase_Dependency();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
-				return getSuccessive_path();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
-				return getPreceding_path();
+		switch(featureID) {
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE:
+			return getSuccessive();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING:
+			if(resolve)
+				return getPreceding();
+			return basicGetPreceding();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
+			if(resolve)
+				return getBase_Dependency();
+			return basicGetBase_Dependency();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
+			return getSuccessive_path();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
+			return getPreceding_path();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE:
-				return !getSuccessive().isEmpty();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING:
-				return basicGetPreceding() != null;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
-				return base_Dependency != null;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
-				return successive_path != null && !successive_path.isEmpty();
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
-				return preceding_path != null && !preceding_path.isEmpty();
+		switch(featureID) {
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE:
+			return !getSuccessive().isEmpty();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING:
+			return basicGetPreceding() != null;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
+			return base_Dependency != null;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
+			return successive_path != null && !successive_path.isEmpty();
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
+			return preceding_path != null && !preceding_path.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)newValue);
-				return;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
-				getSuccessive_path().clear();
-				getSuccessive_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
-				getPreceding_path().clear();
-				getPreceding_path().addAll((Collection<? extends FunctionPrototype>)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)newValue);
+			return;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
+			getSuccessive_path().clear();
+			getSuccessive_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
+			getPreceding_path().clear();
+			getPreceding_path().addAll((Collection<? extends FunctionPrototype>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -256,26 +270,28 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
-				setBase_Dependency((Dependency)null);
-				return;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
-				getSuccessive_path().clear();
-				return;
-			case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
-				getPreceding_path().clear();
-				return;
+		switch(featureID) {
+		case TimingPackage.PRECEDENCE_CONSTRAINT__BASE_DEPENDENCY:
+			setBase_Dependency((Dependency)null);
+			return;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__SUCCESSIVE_PATH:
+			getSuccessive_path().clear();
+			return;
+		case TimingPackage.PRECEDENCE_CONSTRAINT__PRECEDING_PATH:
+			getPreceding_path().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FunctionPrototype getPreceding() {
@@ -307,8 +323,7 @@ public class PrecedenceConstraintImpl extends TimingConstraintImpl implements Pr
 			}
 		}
 		// Convert to InternalEList<?>
-		return new BasicInternalEList<FunctionPrototype>(FunctionPrototype.class, successives.size(), successives
-			.toArray());
+		return new BasicInternalEList<FunctionPrototype>(FunctionPrototype.class, successives.size(), successives.toArray());
 	}
 
 } // PrecedenceConstraintImpl
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimeDurationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimeDurationImpl.java
index 39eb24508ac..8765dffabeb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimeDurationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimeDurationImpl.java
@@ -32,13 +32,13 @@ import org.eclipse.uml2.uml.DataType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getBase_DataType <em>Base Data Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getCseCode <em>Cse Code</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getCseCodeFactor <em>Cse Code Factor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getBase_DataType <em>Base Data Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getCseCode <em>Cse Code</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getCseCodeFactor <em>Cse Code Factor</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimeDurationImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
@@ -47,6 +47,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_DataType()
 	 * @generated
 	 * @ordered
@@ -57,6 +58,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The default value of the '{@link #getCseCode() <em>Cse Code</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCseCode()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The cached value of the '{@link #getCseCode() <em>Cse Code</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCseCode()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The default value of the '{@link #getCseCodeFactor() <em>Cse Code Factor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCseCodeFactor()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The cached value of the '{@link #getCseCodeFactor() <em>Cse Code Factor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCseCodeFactor()
 	 * @generated
 	 * @ordered
@@ -97,6 +102,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -107,6 +113,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -116,6 +123,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TimeDurationImpl() {
@@ -125,20 +133,22 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
-				if (resolve) return getBase_DataType();
-				return basicGetBase_DataType();
-			case TimingPackage.TIME_DURATION__CSE_CODE:
-				return getCseCode();
-			case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
-				return getCseCodeFactor();
-			case TimingPackage.TIME_DURATION__VALUE:
-				return getValue();
+		switch(featureID) {
+		case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
+			if(resolve)
+				return getBase_DataType();
+			return basicGetBase_DataType();
+		case TimingPackage.TIME_DURATION__CSE_CODE:
+			return getCseCode();
+		case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
+			return getCseCodeFactor();
+		case TimingPackage.TIME_DURATION__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -146,19 +156,20 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
-				return base_DataType != null;
-			case TimingPackage.TIME_DURATION__CSE_CODE:
-				return cseCode != CSE_CODE_EDEFAULT;
-			case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
-				return cseCodeFactor != CSE_CODE_FACTOR_EDEFAULT;
-			case TimingPackage.TIME_DURATION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		switch(featureID) {
+		case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
+			return base_DataType != null;
+		case TimingPackage.TIME_DURATION__CSE_CODE:
+			return cseCode != CSE_CODE_EDEFAULT;
+		case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
+			return cseCodeFactor != CSE_CODE_FACTOR_EDEFAULT;
+		case TimingPackage.TIME_DURATION__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -166,23 +177,24 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
-				setBase_DataType((DataType)newValue);
-				return;
-			case TimingPackage.TIME_DURATION__CSE_CODE:
-				setCseCode((Integer)newValue);
-				return;
-			case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
-				setCseCodeFactor((Integer)newValue);
-				return;
-			case TimingPackage.TIME_DURATION__VALUE:
-				setValue((Float)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
+			setBase_DataType((DataType)newValue);
+			return;
+		case TimingPackage.TIME_DURATION__CSE_CODE:
+			setCseCode((Integer)newValue);
+			return;
+		case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
+			setCseCodeFactor((Integer)newValue);
+			return;
+		case TimingPackage.TIME_DURATION__VALUE:
+			setValue((Float)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -190,6 +202,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,14 +213,15 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DataType getBase_DataType() {
-		if (base_DataType != null && base_DataType.eIsProxy()) {
+		if(base_DataType != null && base_DataType.eIsProxy()) {
 			InternalEObject oldBase_DataType = (InternalEObject)base_DataType;
 			base_DataType = (DataType)eResolveProxy(oldBase_DataType);
-			if (base_DataType != oldBase_DataType) {
-				if (eNotificationRequired())
+			if(base_DataType != oldBase_DataType) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIME_DURATION__BASE_DATA_TYPE, oldBase_DataType, base_DataType));
 			}
 		}
@@ -217,6 +231,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DataType basicGetBase_DataType() {
@@ -226,35 +241,37 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_DataType(DataType newBase_DataType) {
 		DataType oldBase_DataType = base_DataType;
 		base_DataType = newBase_DataType;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIME_DURATION__BASE_DATA_TYPE, oldBase_DataType, base_DataType));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
-				setBase_DataType((DataType)null);
-				return;
-			case TimingPackage.TIME_DURATION__CSE_CODE:
-				setCseCode(CSE_CODE_EDEFAULT);
-				return;
-			case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
-				setCseCodeFactor(CSE_CODE_FACTOR_EDEFAULT);
-				return;
-			case TimingPackage.TIME_DURATION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIME_DURATION__BASE_DATA_TYPE:
+			setBase_DataType((DataType)null);
+			return;
+		case TimingPackage.TIME_DURATION__CSE_CODE:
+			setCseCode(CSE_CODE_EDEFAULT);
+			return;
+		case TimingPackage.TIME_DURATION__CSE_CODE_FACTOR:
+			setCseCodeFactor(CSE_CODE_FACTOR_EDEFAULT);
+			return;
+		case TimingPackage.TIME_DURATION__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -262,6 +279,7 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getCseCode() {
@@ -271,18 +289,20 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCseCode(int newCseCode) {
 		int oldCseCode = cseCode;
 		cseCode = newCseCode;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIME_DURATION__CSE_CODE, oldCseCode, cseCode));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getCseCodeFactor() {
@@ -292,18 +312,20 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCseCodeFactor(int newCseCodeFactor) {
 		int oldCseCodeFactor = cseCodeFactor;
 		cseCodeFactor = newCseCodeFactor;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIME_DURATION__CSE_CODE_FACTOR, oldCseCodeFactor, cseCodeFactor));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Float getValue() {
@@ -313,23 +335,26 @@ public class TimeDurationImpl extends EAElementImpl implements TimeDuration {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(Float newValue) {
 		Float oldValue = value;
 		value = newValue;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIME_DURATION__VALUE, oldValue, value));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (cseCode: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingConstraintImpl.java
index 9753a89d450..4121478448c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingConstraintImpl.java
@@ -38,21 +38,23 @@ import org.eclipse.uml2.uml.Constraint;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getUpper <em>Upper</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getLower <em>Lower</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getUpper <em>Upper</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getLower <em>Lower</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingConstraintImpl#getBase_Constraint <em>Base Constraint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class TimingConstraintImpl extends EAElementImpl implements TimingConstraint {
+
 	/**
 	 * The cached value of the '{@link #getMode() <em>Mode</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -63,6 +65,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	 * The cached value of the '{@link #getUpper() <em>Upper</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUpper()
 	 * @generated
 	 * @ordered
@@ -73,6 +76,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	 * The cached value of the '{@link #getLower() <em>Lower</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLower()
 	 * @generated
 	 * @ordered
@@ -83,6 +87,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -93,6 +98,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Constraint()
 	 * @generated
 	 * @ordered
@@ -102,6 +108,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TimingConstraintImpl() {
@@ -111,6 +118,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetLower() {
@@ -120,6 +128,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetUpper() {
@@ -129,25 +138,30 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.TIMING_CONSTRAINT__MODE:
-				return getMode();
-			case TimingPackage.TIMING_CONSTRAINT__UPPER:
-				if (resolve) return getUpper();
-				return basicGetUpper();
-			case TimingPackage.TIMING_CONSTRAINT__LOWER:
-				if (resolve) return getLower();
-				return basicGetLower();
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
+		switch(featureID) {
+		case TimingPackage.TIMING_CONSTRAINT__MODE:
+			return getMode();
+		case TimingPackage.TIMING_CONSTRAINT__UPPER:
+			if(resolve)
+				return getUpper();
+			return basicGetUpper();
+		case TimingPackage.TIMING_CONSTRAINT__LOWER:
+			if(resolve)
+				return getLower();
+			return basicGetLower();
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
+			if(resolve)
+				return getBase_Constraint();
+			return basicGetBase_Constraint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -155,21 +169,22 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING_CONSTRAINT__MODE:
-				return mode != null && !mode.isEmpty();
-			case TimingPackage.TIMING_CONSTRAINT__UPPER:
-				return upper != null;
-			case TimingPackage.TIMING_CONSTRAINT__LOWER:
-				return lower != null;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
-				return base_Class != null;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
-				return base_Constraint != null;
+		switch(featureID) {
+		case TimingPackage.TIMING_CONSTRAINT__MODE:
+			return mode != null && !mode.isEmpty();
+		case TimingPackage.TIMING_CONSTRAINT__UPPER:
+			return upper != null;
+		case TimingPackage.TIMING_CONSTRAINT__LOWER:
+			return lower != null;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
+			return base_Class != null;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
+			return base_Constraint != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -177,28 +192,29 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.TIMING_CONSTRAINT__MODE:
-				getMode().clear();
-				getMode().addAll((Collection<? extends Mode>)newValue);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__UPPER:
-				setUpper((TimeDuration)newValue);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__LOWER:
-				setLower((TimeDuration)newValue);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING_CONSTRAINT__MODE:
+			getMode().clear();
+			getMode().addAll((Collection<? extends Mode>)newValue);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__UPPER:
+			setUpper((TimeDuration)newValue);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__LOWER:
+			setLower((TimeDuration)newValue);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -206,6 +222,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,26 +233,27 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING_CONSTRAINT__MODE:
-				getMode().clear();
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__UPPER:
-				setUpper((TimeDuration)null);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__LOWER:
-				setLower((TimeDuration)null);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING_CONSTRAINT__MODE:
+			getMode().clear();
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__UPPER:
+			setUpper((TimeDuration)null);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__LOWER:
+			setLower((TimeDuration)null);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT:
+			setBase_Constraint((Constraint)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -243,14 +261,15 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getLower() {
-		if (lower != null && lower.eIsProxy()) {
+		if(lower != null && lower.eIsProxy()) {
 			InternalEObject oldLower = (InternalEObject)lower;
 			lower = (TimeDuration)eResolveProxy(oldLower);
-			if (lower != oldLower) {
-				if (eNotificationRequired())
+			if(lower != oldLower) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING_CONSTRAINT__LOWER, oldLower, lower));
 			}
 		}
@@ -260,10 +279,11 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Mode> getMode() {
-		if (mode == null) {
+		if(mode == null) {
 			mode = new EObjectResolvingEList<Mode>(Mode.class, this, TimingPackage.TIMING_CONSTRAINT__MODE);
 		}
 		return mode;
@@ -272,14 +292,15 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getUpper() {
-		if (upper != null && upper.eIsProxy()) {
+		if(upper != null && upper.eIsProxy()) {
 			InternalEObject oldUpper = (InternalEObject)upper;
 			upper = (TimeDuration)eResolveProxy(oldUpper);
-			if (upper != oldUpper) {
-				if (eNotificationRequired())
+			if(upper != oldUpper) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING_CONSTRAINT__UPPER, oldUpper, upper));
 			}
 		}
@@ -289,26 +310,28 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLower(TimeDuration newLower) {
 		TimeDuration oldLower = lower;
 		lower = newLower;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING_CONSTRAINT__LOWER, oldLower, lower));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -318,6 +341,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -327,26 +351,28 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING_CONSTRAINT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
+		if(base_Constraint != null && base_Constraint.eIsProxy()) {
 			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
 			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
+			if(base_Constraint != oldBase_Constraint) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 			}
 		}
@@ -356,6 +382,7 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Constraint basicGetBase_Constraint() {
@@ -365,24 +392,26 @@ public abstract class TimingConstraintImpl extends EAElementImpl implements Timi
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Constraint(Constraint newBase_Constraint) {
 		Constraint oldBase_Constraint = base_Constraint;
 		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING_CONSTRAINT__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUpper(TimeDuration newUpper) {
 		TimeDuration oldUpper = upper;
 		upper = newUpper;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING_CONSTRAINT__UPPER, oldUpper, upper));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingDescriptionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingDescriptionImpl.java
index ddff2fe4488..45d5317757c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingDescriptionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingDescriptionImpl.java
@@ -30,10 +30,10 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingDescriptionImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class TimingDescriptionImpl extends EAElementImpl implements TimingDescription {
@@ -42,13 +42,16 @@ public abstract class TimingDescriptionImpl extends EAElementImpl implements Tim
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
 	 */
 	protected org.eclipse.uml2.uml.Class base_Class;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TimingDescriptionImpl() {
@@ -57,47 +60,52 @@ public abstract class TimingDescriptionImpl extends EAElementImpl implements Tim
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,14 +116,15 @@ public abstract class TimingDescriptionImpl extends EAElementImpl implements Tim
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING_DESCRIPTION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -125,6 +134,7 @@ public abstract class TimingDescriptionImpl extends EAElementImpl implements Tim
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -134,25 +144,27 @@ public abstract class TimingDescriptionImpl extends EAElementImpl implements Tim
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING_DESCRIPTION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING_DESCRIPTION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingFactoryImpl.java
index e5b2231cb82..ff4b59597e2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.timing.*;
 import org.eclipse.papyrus.eastadl.timing.EventChain;
 import org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint;
 import org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint;
@@ -31,12 +32,14 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -48,16 +51,16 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TimingFactory init() {
 		try {
 			TimingFactory theTimingFactory = (TimingFactory)EPackage.Registry.INSTANCE.getEFactory(TimingPackage.eNS_URI);
-			if (theTimingFactory != null) {
+			if(theTimingFactory != null) {
 				return theTimingFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new TimingFactoryImpl();
@@ -66,6 +69,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 	/**
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingFactoryImpl() {
@@ -74,23 +78,30 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TimingPackage.TIME_DURATION: return createTimeDuration();
-			case TimingPackage.TIMING: return createTiming();
-			case TimingPackage.EVENT_CHAIN: return createEventChain();
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT: return createExecutionTimeConstraint();
-			case TimingPackage.PRECEDENCE_CONSTRAINT: return createPrecedenceConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case TimingPackage.TIME_DURATION:
+			return createTimeDuration();
+		case TimingPackage.TIMING:
+			return createTiming();
+		case TimingPackage.EVENT_CHAIN:
+			return createEventChain();
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT:
+			return createExecutionTimeConstraint();
+		case TimingPackage.PRECEDENCE_CONSTRAINT:
+			return createPrecedenceConstraint();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventChain createEventChain() {
@@ -101,6 +112,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ExecutionTimeConstraint createExecutionTimeConstraint() {
@@ -111,6 +123,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PrecedenceConstraint createPrecedenceConstraint() {
@@ -121,6 +134,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration createTimeDuration() {
@@ -130,6 +144,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Timing createTiming() {
@@ -139,6 +154,7 @@ public class TimingFactoryImpl extends EFactoryImpl implements TimingFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingPackage getTimingPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingImpl.java
index d6018a9eb5c..e580fc61bbe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingImpl.java
@@ -36,13 +36,13 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getTimingConstraint <em>Timing Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getTimingDescription <em>Timing Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getTimingConstraint <em>Timing Constraint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getTimingDescription <em>Timing Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.impl.TimingImpl#getBase_Package <em>Base Package</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TimingImpl extends ContextImpl implements Timing {
@@ -50,6 +50,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * The cached value of the '{@link #getTimingConstraint() <em>Timing Constraint</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTimingConstraint()
 	 * @generated
 	 * @ordered
@@ -59,6 +60,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * The cached value of the '{@link #getTimingDescription() <em>Timing Description</em>}' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTimingDescription()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -79,6 +82,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TimingImpl() {
@@ -95,72 +100,78 @@ public class TimingImpl extends ContextImpl implements Timing {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingPackage.TIMING__TIMING_CONSTRAINT:
-				return getTimingConstraint();
-			case TimingPackage.TIMING__TIMING_DESCRIPTION:
-				return getTimingDescription();
-			case TimingPackage.TIMING__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case TimingPackage.TIMING__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
+		switch(featureID) {
+		case TimingPackage.TIMING__TIMING_CONSTRAINT:
+			return getTimingConstraint();
+		case TimingPackage.TIMING__TIMING_DESCRIPTION:
+			return getTimingDescription();
+		case TimingPackage.TIMING__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case TimingPackage.TIMING__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING__TIMING_CONSTRAINT:
-				return timingConstraint != null && !timingConstraint.isEmpty();
-			case TimingPackage.TIMING__TIMING_DESCRIPTION:
-				return timingDescription != null && !timingDescription.isEmpty();
-			case TimingPackage.TIMING__BASE_CLASS:
-				return base_Class != null;
-			case TimingPackage.TIMING__BASE_PACKAGE:
-				return base_Package != null;
+		switch(featureID) {
+		case TimingPackage.TIMING__TIMING_CONSTRAINT:
+			return timingConstraint != null && !timingConstraint.isEmpty();
+		case TimingPackage.TIMING__TIMING_DESCRIPTION:
+			return timingDescription != null && !timingDescription.isEmpty();
+		case TimingPackage.TIMING__BASE_CLASS:
+			return base_Class != null;
+		case TimingPackage.TIMING__BASE_PACKAGE:
+			return base_Package != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingPackage.TIMING__TIMING_CONSTRAINT:
-				getTimingConstraint().clear();
-				getTimingConstraint().addAll((Collection<? extends TimingConstraint>)newValue);
-				return;
-			case TimingPackage.TIMING__TIMING_DESCRIPTION:
-				getTimingDescription().clear();
-				getTimingDescription().addAll((Collection<? extends TimingDescription>)newValue);
-				return;
-			case TimingPackage.TIMING__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case TimingPackage.TIMING__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING__TIMING_CONSTRAINT:
+			getTimingConstraint().clear();
+			getTimingConstraint().addAll((Collection<? extends TimingConstraint>)newValue);
+			return;
+		case TimingPackage.TIMING__TIMING_DESCRIPTION:
+			getTimingDescription().clear();
+			getTimingDescription().addAll((Collection<? extends TimingDescription>)newValue);
+			return;
+		case TimingPackage.TIMING__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case TimingPackage.TIMING__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,33 +181,35 @@ public class TimingImpl extends ContextImpl implements Timing {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingPackage.TIMING__TIMING_CONSTRAINT:
-				getTimingConstraint().clear();
-				return;
-			case TimingPackage.TIMING__TIMING_DESCRIPTION:
-				getTimingDescription().clear();
-				return;
-			case TimingPackage.TIMING__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case TimingPackage.TIMING__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
+		switch(featureID) {
+		case TimingPackage.TIMING__TIMING_CONSTRAINT:
+			getTimingConstraint().clear();
+			return;
+		case TimingPackage.TIMING__TIMING_DESCRIPTION:
+			getTimingDescription().clear();
+			return;
+		case TimingPackage.TIMING__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case TimingPackage.TIMING__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TimingConstraint> getTimingConstraint() {
-		if (timingConstraint == null) {
+		if(timingConstraint == null) {
 			timingConstraint = new EObjectResolvingEList<TimingConstraint>(TimingConstraint.class, this, TimingPackage.TIMING__TIMING_CONSTRAINT);
 		}
 		return timingConstraint;
@@ -204,10 +217,11 @@ public class TimingImpl extends ContextImpl implements Timing {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TimingDescription> getTimingDescription() {
-		if (timingDescription == null) {
+		if(timingDescription == null) {
 			timingDescription = new EObjectResolvingEList<TimingDescription>(TimingDescription.class, this, TimingPackage.TIMING__TIMING_DESCRIPTION);
 		}
 		return timingDescription;
@@ -216,14 +230,15 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -233,6 +248,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -242,26 +258,28 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingPackage.TIMING__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -271,6 +289,7 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -280,12 +299,13 @@ public class TimingImpl extends ContextImpl implements Timing {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingPackage.TIMING__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingPackageImpl.java
index 4476dab8a4f..91a2a4b5be4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/impl/TimingPackageImpl.java
@@ -90,12 +90,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -103,16 +105,18 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * 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 TimingPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link TimingPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static TimingPackage init() {
-		if (isInited) return (TimingPackage)EPackage.Registry.INSTANCE.getEPackage(TimingPackage.eNS_URI);
+		if(isInited)
+			return (TimingPackage)EPackage.Registry.INSTANCE.getEPackage(TimingPackage.eNS_URI);
 
 		// Obtain or create and register package
 		TimingPackageImpl theTimingPackage = (TimingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TimingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TimingPackageImpl());
@@ -214,7 +218,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 		// Mark meta-data to indicate it can't be changed
 		theTimingPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(TimingPackage.eNS_URI, theTimingPackage);
 		return theTimingPackage;
@@ -222,24 +226,28 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass timingDescriptionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass timingConstraintEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventChainEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventEClass = null;
@@ -247,6 +255,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass executionTimeConstraintEClass = null;
@@ -254,6 +263,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass precedenceConstraintEClass = null;
@@ -261,37 +271,40 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass timeDurationEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass timingEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingPackage#eNS_URI
 	 * @see #init()
@@ -302,13 +315,15 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -359,6 +374,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEvent() {
@@ -367,6 +383,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEvent_IsStateChanged() {
@@ -375,6 +392,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEventChain() {
@@ -383,6 +401,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventChain_Response() {
@@ -391,6 +410,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventChain_Segment() {
@@ -399,6 +419,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventChain_Stimulus() {
@@ -407,6 +428,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventChain_Strand() {
@@ -416,6 +438,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getExecutionTimeConstraint() {
@@ -425,6 +448,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getExecutionTimeConstraint_TargetDesignFunctionType() {
@@ -434,6 +458,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getExecutionTimeConstraint_TargetDesignFunction() {
@@ -443,6 +468,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getExecutionTimeConstraint_TargetDesignFunctionPrototype() {
@@ -452,6 +478,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getExecutionTimeConstraint_Variation() {
@@ -461,6 +488,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPrecedenceConstraint() {
@@ -470,6 +498,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPrecedenceConstraint_Preceding() {
@@ -479,6 +508,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPrecedenceConstraint_Base_Dependency() {
@@ -488,6 +518,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPrecedenceConstraint_Successive_path() {
@@ -497,6 +528,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPrecedenceConstraint_Preceding_path() {
@@ -506,6 +538,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPrecedenceConstraint_Successive() {
@@ -515,6 +548,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTimeDuration() {
@@ -524,6 +558,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimeDuration_Base_DataType() {
@@ -533,6 +568,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTimeDuration_CseCode() {
@@ -542,6 +578,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTimeDuration_CseCodeFactor() {
@@ -551,6 +588,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTimeDuration_Value() {
@@ -559,6 +597,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTiming() {
@@ -567,6 +606,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTiming_TimingConstraint() {
@@ -575,6 +615,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTiming_TimingDescription() {
@@ -584,6 +625,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTiming_Base_Class() {
@@ -593,6 +635,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTiming_Base_Package() {
@@ -601,6 +644,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTimingConstraint() {
@@ -610,6 +654,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingConstraint_Lower() {
@@ -619,6 +664,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingConstraint_Base_Class() {
@@ -628,6 +674,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingConstraint_Base_Constraint() {
@@ -636,6 +683,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingConstraint_Mode() {
@@ -645,6 +693,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingConstraint_Upper() {
@@ -653,6 +702,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTimingDescription() {
@@ -662,6 +712,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTimingDescription_Base_Class() {
@@ -670,6 +721,7 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingFactory getTimingFactory() {
@@ -677,13 +729,15 @@ public class TimingPackageImpl extends EPackageImpl implements TimingPackage {
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/AgeTimingConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/AgeTimingConstraint.java
index ac5a82c430e..0fd0daa9d8c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/AgeTimingConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/AgeTimingConstraint.java
@@ -20,20 +20,21 @@ package org.eclipse.papyrus.eastadl.timing.timingconstraints;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Age Timing Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * Different tolerances on over-/undersampling can be identified when the solution has been modeled.
  * 
  * An age constraint is of interest in control engineering when looking back through the system.
  * 
- * In case of over- or undersampling, there is no one-to-one relation possible between the occurrences of stimuli and responses of the associated event chain. Thus, the age constraint defines the semantic of which delay must be constrained.
+ * In case of over- or undersampling, there is no one-to-one relation possible between the occurrences of stimuli and responses of the associated
+ * event chain. Thus, the age constraint defines the semantic of which delay must be constrained.
  * 
  * The attribute upper is applicable in worst-case analysis.
  * 
  * The attribute lower is applicable in best-case analysis.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getAgeTimingConstraint()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ArbitraryEventConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ArbitraryEventConstraint.java
index e6032fb18b8..faa1d4eeb30 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ArbitraryEventConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ArbitraryEventConstraint.java
@@ -23,35 +23,44 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Arbitrary Event Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Arbitrary Event Model describes that an event occurs occasionally, singly, irregular or randomly. The primary purpose of this event model is to abstract event occurrences captured by data acquisition tools (background debugger, trace analyzer, etc.) during the operation of a system.
+ * The Arbitrary Event Model describes that an event occurs occasionally, singly, irregular or randomly. The primary purpose of this event model is to
+ * abstract event occurrences captured by data acquisition tools (background debugger, trace analyzer, etc.) during the operation of a system.
  * 
  * Constraints:
- * [1] The number of elements in the sets minimum inter-arrival time and maximum inter-arrival time must be the same. Rationale: Consistent specification of arrival times.
+ * [1] The number of elements in the sets minimum inter-arrival time and maximum inter-arrival time must be the same. Rationale: Consistent
+ * specification of arrival times.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getArbitraryEventConstraint()
  * @model
  * @generated
  */
 public interface ArbitraryEventConstraint extends EventConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Maximum Inter Arrival Time</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.timing.TimeDuration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The set of maximum inter-arrival times specifies the maximum inter-arrival time between two and more subsequent occurrences of the event. The first element in the set specifies the maximum inter-arrival time between two subsequent occurrences of the event among the given occurrences. The second element in the set specifies the maximum inter-arrival time between three subsequent occurrences of the event among the given occurrences; and so forth.
+	 * The set of maximum inter-arrival times specifies the maximum inter-arrival time between two and more subsequent occurrences of the event. The
+	 * first element in the set specifies the maximum inter-arrival time between two subsequent occurrences of the event among the given occurrences.
+	 * The second element in the set specifies the maximum inter-arrival time between three subsequent occurrences of the event among the given
+	 * occurrences; and so forth.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Maximum Inter Arrival Time</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getArbitraryEventConstraint_MaximumInterArrivalTime()
 	 * @model required="true" ordered="false"
@@ -65,8 +74,12 @@ public interface ArbitraryEventConstraint extends EventConstraint {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The set of minimum inter-arrival times specifies the minimum inter-arrival time between two and more subsequent occurrences of the event. The first element in the set specifies the minimum inter-arrival time between two subsequent occurrences of the event among the given occurrences. The second element in the set specifies the minimum inter-arrival time between three subsequent occurrences of the event among the given occurrences; and so forth.
+	 * The set of minimum inter-arrival times specifies the minimum inter-arrival time between two and more subsequent occurrences of the event. The
+	 * first element in the set specifies the minimum inter-arrival time between two subsequent occurrences of the event among the given occurrences.
+	 * The second element in the set specifies the minimum inter-arrival time between three subsequent occurrences of the event among the given
+	 * occurrences; and so forth.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Minimum Inter Arrival Time</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getArbitraryEventConstraint_MinimumInterArrivalTime()
 	 * @model required="true" ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/DelayConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/DelayConstraint.java
index f736cb9a12e..93392a0b2b6 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/DelayConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/DelayConstraint.java
@@ -23,11 +23,12 @@ import org.eclipse.papyrus.eastadl.timing.TimingConstraint;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Delay Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * DelayConstraints give bounds on system timing attributes, i.e. end-to-end delays, periods, etc.
  * 
- * A DelayConstraint can specify one or several of an upper bound, a lower bound or a nominal value and jitter. The jitter is evenly distributed around the nominal (nominal - jitter/2 .. nominal + jitter/2). The bound will be measured in a given unit.
+ * A DelayConstraint can specify one or several of an upper bound, a lower bound or a nominal value and jitter. The jitter is evenly distributed
+ * around the nominal (nominal - jitter/2 .. nominal + jitter/2). The bound will be measured in a given unit.
  * 
  * Constraints:
  * [1] At least Upper or Nominal must be specified. Rationale: At least one value is needed to work with.
@@ -42,21 +43,22 @@ import org.eclipse.papyrus.eastadl.timing.TimingConstraint;
  * Extension:
  * abstract, no extension
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal <em>Nominal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal <em>Nominal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope <em>Scope</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getDelayConstraint()
  * @model abstract="true"
  * @generated
  */
 public interface DelayConstraint extends TimingConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -64,6 +66,7 @@ public interface DelayConstraint extends TimingConstraint {
 	 * <!-- begin-model-doc -->
 	 * Jitter is the range within which a value varies.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Jitter</em>' reference.
 	 * @see #setJitter(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getDelayConstraint_Jitter()
@@ -79,6 +82,7 @@ public interface DelayConstraint extends TimingConstraint {
 	 * <!-- begin-model-doc -->
 	 * The recurring distance between each occurrence.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Nominal</em>' reference.
 	 * @see #setNominal(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getDelayConstraint_Nominal()
@@ -91,10 +95,10 @@ public interface DelayConstraint extends TimingConstraint {
 	 * Returns the value of the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Scope</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Scope</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Scope</em>' reference.
 	 * @see #setScope(EventChain)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getDelayConstraint_Scope()
@@ -107,7 +111,9 @@ public interface DelayConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter <em>Jitter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jitter</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Jitter</em>' reference.
 	 * @see #getJitter()
 	 * @generated
 	 */
@@ -117,7 +123,9 @@ public interface DelayConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal <em>Nominal</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nominal</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Nominal</em>' reference.
 	 * @see #getNominal()
 	 * @generated
 	 */
@@ -127,7 +135,9 @@ public interface DelayConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope <em>Scope</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Scope</em>' reference.
 	 * @see #getScope()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/EventConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/EventConstraint.java
index 29079f19354..4148fe54537 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/EventConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/EventConstraint.java
@@ -23,32 +23,33 @@ import org.eclipse.papyrus.eastadl.timing.TimingConstraint;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Event Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * An EventConstraint describes the basic characteristics of the way an event occurs over time.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent <em>Event</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset <em>Offset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent <em>Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset <em>Offset</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getEventConstraint()
  * @model abstract="true"
  * @generated
  */
 public interface EventConstraint extends TimingConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Event</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Event</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Event</em>' reference.
 	 * @see #setEvent(Event)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getEventConstraint_Event()
@@ -62,8 +63,10 @@ public interface EventConstraint extends TimingConstraint {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * In addition an event model may specify an offset, which delays the start of the first period - the occurrence of the very first event - by the given amount of time.
+	 * In addition an event model may specify an offset, which delays the start of the first period - the occurrence of the very first event - by the
+	 * given amount of time.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Offset</em>' reference.
 	 * @see #setOffset(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getEventConstraint_Offset()
@@ -76,7 +79,9 @@ public interface EventConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent <em>Event</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Event</em>' reference.
 	 * @see #getEvent()
 	 * @generated
 	 */
@@ -86,7 +91,9 @@ public interface EventConstraint extends TimingConstraint {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset <em>Offset</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Offset</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Offset</em>' reference.
 	 * @see #getOffset()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/InputSynchronizationConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/InputSynchronizationConstraint.java
index 34a2177481b..3a508bbd01a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/InputSynchronizationConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/InputSynchronizationConstraint.java
@@ -21,35 +21,40 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Input Synchronization Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * InputSynchronizationConstraint is a language entity that expresses a timing constraint on the input synchronization among the set of stimulus events.
+ * InputSynchronizationConstraint is a language entity that expresses a timing constraint on the input synchronization among the set of stimulus
+ * events.
  * 
  * Semantics:
- * The parameters of InputSynchronizationConstraint, see TimingConstraint, constrain the time from the first stimulus until last stimulus (i.e., maximum skew between these stimuli). A join point is identified by the response event in the scope EventChain.
+ * The parameters of InputSynchronizationConstraint, see TimingConstraint, constrain the time from the first stimulus until last stimulus (i.e.,
+ * maximum skew between these stimuli). A join point is identified by the response event in the scope EventChain.
  * 
  * Constraints:
- * [1] The set of FunctionFlowPorts referenced by the events should contain only FlowPorts with direction = in. The rationale for this is that the events shall relate to data on FunctionFlowPorts which is considered (or shall be) temporally consistent.
+ * [1] The set of FunctionFlowPorts referenced by the events should contain only FlowPorts with direction = in. The rationale for this is that the
+ * events shall relate to data on FunctionFlowPorts which is considered (or shall be) temporally consistent.
  * 
  * [2] The scope EventChain shall contain exactly one response Event.
  * 
- * [3] The semantics of this constraint requires that there is more than one stimulus Event in the scope EventChain (each refering to a different FlowPort with direction = in).
+ * [3] The semantics of this constraint requires that there is more than one stimulus Event in the scope EventChain (each refering to a different
+ * FlowPort with direction = in).
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getInputSynchronizationConstraint()
  * @model
  * @generated
  */
 public interface InputSynchronizationConstraint extends AgeTimingConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Width</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -57,6 +62,7 @@ public interface InputSynchronizationConstraint extends AgeTimingConstraint {
 	 * <!-- begin-model-doc -->
 	 * The width of the sliding window.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' reference.
 	 * @see #setWidth(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getInputSynchronizationConstraint_Width()
@@ -66,10 +72,13 @@ public interface InputSynchronizationConstraint extends AgeTimingConstraint {
 	TimeDuration getWidth();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth <em>Width</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth <em>Width</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Width</em>' reference.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/OutputSynchronizationConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/OutputSynchronizationConstraint.java
index 816d995942e..03ebfe7a076 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/OutputSynchronizationConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/OutputSynchronizationConstraint.java
@@ -21,15 +21,18 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Output Synchronization Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * OutputSynchronizationConstraint is a language entity that expresses a timing constraint on the output synchronization among the set of response events.
+ * OutputSynchronizationConstraint is a language entity that expresses a timing constraint on the output synchronization among the set of response
+ * events.
  * 
  * Semantics:
- * The parameters of OutputSynchronizationConstraint, see TimingConstraints, constrain the time from the first response until last response (i.e., maximum skew between these responses). A fork point is identified by the stimulus event in the scope EventChain.
+ * The parameters of OutputSynchronizationConstraint, see TimingConstraints, constrain the time from the first response until last response (i.e.,
+ * maximum skew between these responses). A fork point is identified by the stimulus event in the scope EventChain.
  * 
  * Constraints:
- * [1] The set of FunctionFlowPorts referenced by the events should contain only OutFlowPorts. The rationale for this is that the events shall relate to data on FunctionFlowPorts which is considered (or shall be) temporally consistent.
+ * [1] The set of FunctionFlowPorts referenced by the events should contain only OutFlowPorts. The rationale for this is that the events shall relate
+ * to data on FunctionFlowPorts which is considered (or shall be) temporally consistent.
  * 
  * [2] The scope EventChain shall contain exactly one stimulus Event.
  * 
@@ -38,19 +41,20 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * 
  * Extension: Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getOutputSynchronizationConstraint()
  * @model
  * @generated
  */
 public interface OutputSynchronizationConstraint extends ReactionConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Width</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -58,6 +62,7 @@ public interface OutputSynchronizationConstraint extends ReactionConstraint {
 	 * <!-- begin-model-doc -->
 	 * The width of the sliding window.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Width</em>' reference.
 	 * @see #setWidth(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getOutputSynchronizationConstraint_Width()
@@ -67,10 +72,13 @@ public interface OutputSynchronizationConstraint extends ReactionConstraint {
 	TimeDuration getWidth();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Width</em>' reference.
 	 * @see #getWidth()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PatternEventConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PatternEventConstraint.java
index 8943f615c1e..ded7bdec90d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PatternEventConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PatternEventConstraint.java
@@ -23,26 +23,29 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Pattern Event Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The [Concrete] Pattern Event Constraint describes that an event occurs following a known pattern. The pattern event model is characterized by the following parameters:
+ * The [Concrete] Pattern Event Constraint describes that an event occurs following a known pattern. The pattern event model is characterized by the
+ * following parameters:
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getOccurence <em>Occurence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getOccurence <em>Occurence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter <em>Jitter</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPatternEventConstraint()
  * @model
  * @generated
  */
 public interface PatternEventConstraint extends EventConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -50,6 +53,7 @@ public interface PatternEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The jitter specifies maximal possible time interval the occurrence of the events within the given period can vary (formerly: can be delayed).
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Jitter</em>' reference.
 	 * @see #setJitter(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPatternEventConstraint_Jitter()
@@ -63,8 +67,10 @@ public interface PatternEventConstraint extends EventConstraint {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The minimum inter-arrival time specifies the minimal possible time interval between two consecutive occurrences of the event within the given period.
+	 * The minimum inter-arrival time specifies the minimal possible time interval between two consecutive occurrences of the event within the given
+	 * period.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #setMinimumInterArrivalTime(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPatternEventConstraint_MinimumInterArrivalTime()
@@ -79,8 +85,10 @@ public interface PatternEventConstraint extends EventConstraint {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The set occurrence (1..n) specifies the offset for each occurrence of the event in the specified period. Each occurrence is specified from the beginning of the period
+	 * The set occurrence (1..n) specifies the offset for each occurrence of the event in the specified period. Each occurrence is specified from the
+	 * beginning of the period
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Occurence</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPatternEventConstraint_Occurence()
 	 * @model required="true"
@@ -95,6 +103,7 @@ public interface PatternEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The period specifies the time interval within the event occurs any number of times following a pattern.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Period</em>' reference.
 	 * @see #setPeriod(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPatternEventConstraint_Period()
@@ -104,30 +113,39 @@ public interface PatternEventConstraint extends EventConstraint {
 	TimeDuration getPeriod();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter <em>Jitter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter <em>Jitter</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jitter</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Jitter</em>' reference.
 	 * @see #getJitter()
 	 * @generated
 	 */
 	void setJitter(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 */
 	void setMinimumInterArrivalTime(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod <em>Period</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod <em>Period</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Period</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Period</em>' reference.
 	 * @see #getPeriod()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PeriodicEventConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PeriodicEventConstraint.java
index 95d5f58b689..a286f7a89eb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PeriodicEventConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/PeriodicEventConstraint.java
@@ -21,25 +21,27 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Periodic Event Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The PeriodicEventConstraint describes that an event occurs periodically.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPeriodicEventConstraint()
  * @model
  * @generated
  */
 public interface PeriodicEventConstraint extends EventConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -47,6 +49,7 @@ public interface PeriodicEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The jitter specifies the maximal possible time interval the occurrence of an event can vary (formerly: be delayed).
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Jitter</em>' reference.
 	 * @see #setJitter(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPeriodicEventConstraint_Jitter()
@@ -62,6 +65,7 @@ public interface PeriodicEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The minimum inter-arrival time specifies the minimal possible time interval between two consecutive occurrences of an event.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #setMinimumInterArrivalTime(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPeriodicEventConstraint_MinimumInterArrivalTime()
@@ -77,6 +81,7 @@ public interface PeriodicEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The period specifies the ideal time interval between two subsequent occurrences of the event.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Period</em>' reference.
 	 * @see #setPeriod(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getPeriodicEventConstraint_Period()
@@ -86,30 +91,39 @@ public interface PeriodicEventConstraint extends EventConstraint {
 	TimeDuration getPeriod();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter <em>Jitter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter <em>Jitter</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jitter</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Jitter</em>' reference.
 	 * @see #getJitter()
 	 * @generated
 	 */
 	void setJitter(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 */
 	void setMinimumInterArrivalTime(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod <em>Period</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod <em>Period</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Period</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Period</em>' reference.
 	 * @see #getPeriod()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ReactionConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ReactionConstraint.java
index 85e79e41bad..9894d123258 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ReactionConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/ReactionConstraint.java
@@ -20,14 +20,15 @@ package org.eclipse.papyrus.eastadl.timing.timingconstraints;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Reaction Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ReactionConstraint is used to impose a timing constraint on an event chain in order to specify bounds for reacting on the occurrence of a stimulus or stimuli. The intention of this constraint is to look forward in time.
+ * ReactionConstraint is used to impose a timing constraint on an event chain in order to specify bounds for reacting on the occurrence of a stimulus
+ * or stimuli. The intention of this constraint is to look forward in time.
  * 
  * Compare AgeTimingConstraint.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getReactionConstraint()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/SporadicEventConstraint.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/SporadicEventConstraint.java
index ff633b40764..ea3382fad6a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/SporadicEventConstraint.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/SporadicEventConstraint.java
@@ -21,35 +21,42 @@ import org.eclipse.papyrus.eastadl.timing.TimeDuration;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Sporadic Event Constraint</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The Sporadic Event Constraint describes that an event occurs occasionally. In general it is supposed that the event eventually occurs. Indeed, it is also known that some of the events do not occur for whatsoever reasons.
+ * The Sporadic Event Constraint describes that an event occurs occasionally. In general it is supposed that the event eventually occurs. Indeed, it
+ * is also known that some of the events do not occur for whatsoever reasons.
  * 
- * Note! The parameters minimum inter-arrival time and maximum inter-arrival time must reference the same point in time. Typically, this is the point in time that specifies the beginning of the period subject to consideration.
+ * Note! The parameters minimum inter-arrival time and maximum inter-arrival time must reference the same point in time. Typically, this is the point
+ * in time that specifies the beginning of the period subject to consideration.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time
+ * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getSporadicEventConstraint()
  * @model
  * @generated
  */
 public interface SporadicEventConstraint extends EventConstraint {
+
 	/**
 	 * Returns the value of the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The optional parameter jitter specifies the maximal possible time interval the occurrence of an event can vary (formerly: be delayed). By nature, a sporadic event is supposed to occur at any time, thus it is one of the characteristic that the occurrence is jittery.
+	 * The optional parameter jitter specifies the maximal possible time interval the occurrence of an event can vary (formerly: be delayed). By
+	 * nature, a sporadic event is supposed to occur at any time, thus it is one of the characteristic that the occurrence is jittery.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Jitter</em>' reference.
 	 * @see #setJitter(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getSporadicEventConstraint_Jitter()
@@ -66,9 +73,12 @@ public interface SporadicEventConstraint extends EventConstraint {
 	 * The optional parameter maximum inter-arrival time specifies the maximal possible time interval between two consecutive occurrences of an event.
 	 * The maximum inter-arrival time may be used to describe different cases:
 	 * (1) The maximum inter-arrival time is equal to the duration of the period.
-	 * (2) The maximum inter-arrival time is used to specify a point in time within the period that immediately follows the period subject to consideration.
-	 * (3) The maximum inter-arrival time is used to specify a point in time within one of the subsequent periods that follow the period subject to consideration.
+	 * (2) The maximum inter-arrival time is used to specify a point in time within the period that immediately follows the period subject to
+	 * consideration.
+	 * (3) The maximum inter-arrival time is used to specify a point in time within one of the subsequent periods that follow the period subject to
+	 * consideration.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Maximum Inter Arrival Time</em>' reference.
 	 * @see #setMaximumInterArrivalTime(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getSporadicEventConstraint_MaximumInterArrivalTime()
@@ -84,6 +94,7 @@ public interface SporadicEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The minimum inter-arrival time specifies is the minimal possible time interval between two consecutive occurrences of an event.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #setMinimumInterArrivalTime(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getSporadicEventConstraint_MinimumInterArrivalTime()
@@ -99,6 +110,7 @@ public interface SporadicEventConstraint extends EventConstraint {
 	 * <!-- begin-model-doc -->
 	 * The period specifies the ideal time interval between two subsequent occurrences of the event.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Period</em>' reference.
 	 * @see #setPeriod(TimeDuration)
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#getSporadicEventConstraint_Period()
@@ -108,40 +120,52 @@ public interface SporadicEventConstraint extends EventConstraint {
 	TimeDuration getPeriod();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter <em>Jitter</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter <em>Jitter</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jitter</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Jitter</em>' reference.
 	 * @see #getJitter()
 	 * @generated
 	 */
 	void setJitter(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime
+	 * <em>Maximum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Maximum Inter Arrival Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Maximum Inter Arrival Time</em>' reference.
 	 * @see #getMaximumInterArrivalTime()
 	 * @generated
 	 */
 	void setMaximumInterArrivalTime(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Minimum Inter Arrival Time</em>' reference.
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 */
 	void setMinimumInterArrivalTime(TimeDuration value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod <em>Period</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod <em>Period</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Period</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Period</em>' reference.
 	 * @see #getPeriod()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsFactory.java
index a9ca54e33d2..3ae63d16715 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsFactory.java
@@ -22,14 +22,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage
  * @generated
  */
 public interface TimingconstraintsFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	TimingconstraintsFactory eINSTANCE = org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsFactoryImpl.init();
@@ -38,6 +41,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Age Timing Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Age Timing Constraint</em>'.
 	 * @generated
 	 */
@@ -47,6 +51,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Arbitrary Event Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Arbitrary Event Constraint</em>'.
 	 * @generated
 	 */
@@ -56,6 +61,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Input Synchronization Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Input Synchronization Constraint</em>'.
 	 * @generated
 	 */
@@ -65,6 +71,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Output Synchronization Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Output Synchronization Constraint</em>'.
 	 * @generated
 	 */
@@ -74,6 +81,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Pattern Event Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Pattern Event Constraint</em>'.
 	 * @generated
 	 */
@@ -83,6 +91,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Periodic Event Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Periodic Event Constraint</em>'.
 	 * @generated
 	 */
@@ -92,6 +101,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Reaction Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Reaction Constraint</em>'.
 	 * @generated
 	 */
@@ -101,6 +111,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns a new object of class '<em>Sporadic Event Constraint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Sporadic Event Constraint</em>'.
 	 * @generated
 	 */
@@ -110,6 +121,7 @@ public interface TimingconstraintsFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsPackage.java
index 8fe3bef3bb8..29bd2f18c3c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/TimingconstraintsPackage.java
@@ -26,37 +26,43 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * This section describes the timing constraints.
  * <!-- end-model-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsFactory
  * @model kind="package"
  * @generated
  */
 public interface TimingconstraintsPackage extends EPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl <em>Delay Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl
+		 * <em>Delay Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getDelayConstraint()
 		 * @generated
@@ -67,6 +73,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Jitter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DELAY_CONSTRAINT__JITTER = eINSTANCE.getDelayConstraint_Jitter();
@@ -75,6 +82,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Nominal</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DELAY_CONSTRAINT__NOMINAL = eINSTANCE.getDelayConstraint_Nominal();
@@ -83,14 +91,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Scope</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DELAY_CONSTRAINT__SCOPE = eINSTANCE.getDelayConstraint_Scope();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl <em>Age Timing Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl
+		 * <em>Age Timing Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getAgeTimingConstraint()
 		 * @generated
@@ -98,9 +109,11 @@ public interface TimingconstraintsPackage extends EPackage {
 		EClass AGE_TIMING_CONSTRAINT = eINSTANCE.getAgeTimingConstraint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl <em>Event Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl
+		 * <em>Event Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getEventConstraint()
 		 * @generated
@@ -111,6 +124,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Event</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_CONSTRAINT__EVENT = eINSTANCE.getEventConstraint_Event();
@@ -119,14 +133,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Offset</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EVENT_CONSTRAINT__OFFSET = eINSTANCE.getEventConstraint_Offset();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl <em>Input Synchronization Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl
+		 * <em>Input Synchronization Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getInputSynchronizationConstraint()
 		 * @generated
@@ -137,14 +154,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Width</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH = eINSTANCE.getInputSynchronizationConstraint_Width();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl <em>Output Synchronization Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl
+		 * <em>Output Synchronization Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getOutputSynchronizationConstraint()
 		 * @generated
@@ -155,14 +175,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Width</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH = eINSTANCE.getOutputSynchronizationConstraint_Width();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl <em>Reaction Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl
+		 * <em>Reaction Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getReactionConstraint()
 		 * @generated
@@ -170,9 +193,11 @@ public interface TimingconstraintsPackage extends EPackage {
 		EClass REACTION_CONSTRAINT = eINSTANCE.getReactionConstraint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl <em>Sporadic Event Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl
+		 * <em>Sporadic Event Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getSporadicEventConstraint()
 		 * @generated
@@ -183,6 +208,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Jitter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPORADIC_EVENT_CONSTRAINT__JITTER = eINSTANCE.getSporadicEventConstraint_Jitter();
@@ -191,6 +217,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Period</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPORADIC_EVENT_CONSTRAINT__PERIOD = eINSTANCE.getSporadicEventConstraint_Period();
@@ -199,6 +226,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Maximum Inter Arrival Time</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getSporadicEventConstraint_MaximumInterArrivalTime();
@@ -207,14 +235,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Minimum Inter Arrival Time</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getSporadicEventConstraint_MinimumInterArrivalTime();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl <em>Periodic Event Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl
+		 * <em>Periodic Event Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getPeriodicEventConstraint()
 		 * @generated
@@ -225,6 +256,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Jitter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PERIODIC_EVENT_CONSTRAINT__JITTER = eINSTANCE.getPeriodicEventConstraint_Jitter();
@@ -233,6 +265,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Period</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PERIODIC_EVENT_CONSTRAINT__PERIOD = eINSTANCE.getPeriodicEventConstraint_Period();
@@ -241,14 +274,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Minimum Inter Arrival Time</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getPeriodicEventConstraint_MinimumInterArrivalTime();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl <em>Pattern Event Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl
+		 * <em>Pattern Event Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getPatternEventConstraint()
 		 * @generated
@@ -259,6 +295,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Period</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN_EVENT_CONSTRAINT__PERIOD = eINSTANCE.getPatternEventConstraint_Period();
@@ -267,6 +304,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Minimum Inter Arrival Time</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getPatternEventConstraint_MinimumInterArrivalTime();
@@ -275,6 +313,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Occurence</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN_EVENT_CONSTRAINT__OCCURENCE = eINSTANCE.getPatternEventConstraint_Occurence();
@@ -283,14 +322,17 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Jitter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN_EVENT_CONSTRAINT__JITTER = eINSTANCE.getPatternEventConstraint_Jitter();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl <em>Arbitrary Event Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl
+		 * <em>Arbitrary Event Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl
 		 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getArbitraryEventConstraint()
 		 * @generated
@@ -301,6 +343,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Minimum Inter Arrival Time</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getArbitraryEventConstraint_MinimumInterArrivalTime();
@@ -309,6 +352,7 @@ public interface TimingconstraintsPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Maximum Inter Arrival Time</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME = eINSTANCE.getArbitraryEventConstraint_MaximumInterArrivalTime();
@@ -319,6 +363,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "timingconstraints";
@@ -327,6 +372,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Timing/TimingConstraints/1";
@@ -335,6 +381,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "TimingConstraints";
@@ -343,14 +390,17 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	TimingconstraintsPackage eINSTANCE = org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl <em>Delay Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl <em>Delay Constraint</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getDelayConstraint()
 	 * @generated
@@ -361,6 +411,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -370,6 +421,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -379,6 +431,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -388,6 +441,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -397,6 +451,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -406,6 +461,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -415,6 +471,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -424,6 +481,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -433,6 +491,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -442,6 +501,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Nominal</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -451,6 +511,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -460,15 +521,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Delay Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DELAY_CONSTRAINT_FEATURE_COUNT = TimingPackage.TIMING_CONSTRAINT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl <em>Age Timing Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl
+	 * <em>Age Timing Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.AgeTimingConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getAgeTimingConstraint()
 	 * @generated
@@ -479,6 +543,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -488,6 +553,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -497,6 +563,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -506,6 +573,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -515,6 +583,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -524,6 +593,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -533,6 +603,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -542,6 +613,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -551,6 +623,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -560,6 +633,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Nominal</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -569,6 +643,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -578,15 +653,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Age Timing Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int AGE_TIMING_CONSTRAINT_FEATURE_COUNT = DELAY_CONSTRAINT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl <em>Event Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl <em>Event Constraint</em>}'
+	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getEventConstraint()
 	 * @generated
@@ -597,6 +675,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -606,6 +685,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -615,6 +695,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -624,6 +705,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -633,6 +715,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -642,6 +725,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -651,6 +735,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -660,6 +745,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -669,6 +755,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -678,6 +765,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Offset</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -687,15 +775,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Event Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EVENT_CONSTRAINT_FEATURE_COUNT = TimingPackage.TIMING_CONSTRAINT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl <em>Input Synchronization Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl
+	 * <em>Input Synchronization Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getInputSynchronizationConstraint()
 	 * @generated
@@ -706,6 +797,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -715,6 +807,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -724,6 +817,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -733,6 +827,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -742,6 +837,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -751,6 +847,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -760,6 +857,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -769,6 +867,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -778,6 +877,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -787,6 +887,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Nominal</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -796,6 +897,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -805,6 +907,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Width</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -814,15 +917,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Input Synchronization Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INPUT_SYNCHRONIZATION_CONSTRAINT_FEATURE_COUNT = AGE_TIMING_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl <em>Reaction Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl
+	 * <em>Reaction Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ReactionConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getReactionConstraint()
 	 * @generated
@@ -833,6 +939,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -842,6 +949,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -851,6 +959,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -860,6 +969,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -869,6 +979,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -878,6 +989,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -887,6 +999,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -896,6 +1009,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -905,6 +1019,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -914,6 +1029,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Nominal</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -923,6 +1039,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -932,15 +1049,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Reaction Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REACTION_CONSTRAINT_FEATURE_COUNT = DELAY_CONSTRAINT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl <em>Output Synchronization Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl
+	 * <em>Output Synchronization Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getOutputSynchronizationConstraint()
 	 * @generated
@@ -951,6 +1071,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -960,6 +1081,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -969,6 +1091,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -978,6 +1101,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -987,6 +1111,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -996,6 +1121,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1005,6 +1131,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1014,6 +1141,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1023,6 +1151,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1032,6 +1161,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Nominal</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1041,6 +1171,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Scope</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1050,6 +1181,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Width</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1059,15 +1191,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Output Synchronization Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int OUTPUT_SYNCHRONIZATION_CONSTRAINT_FEATURE_COUNT = REACTION_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl <em>Sporadic Event Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl
+	 * <em>Sporadic Event Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getSporadicEventConstraint()
 	 * @generated
@@ -1078,6 +1213,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1087,6 +1223,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1096,6 +1233,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1105,6 +1243,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1114,6 +1253,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1123,6 +1263,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1132,6 +1273,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1141,6 +1283,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1150,6 +1293,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1159,6 +1303,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Offset</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1168,6 +1313,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1177,6 +1323,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Period</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1186,6 +1333,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Maximum Inter Arrival Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1195,6 +1343,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Minimum Inter Arrival Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1204,15 +1353,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Sporadic Event Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int SPORADIC_EVENT_CONSTRAINT_FEATURE_COUNT = EVENT_CONSTRAINT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl <em>Periodic Event Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl
+	 * <em>Periodic Event Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getPeriodicEventConstraint()
 	 * @generated
@@ -1223,6 +1375,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1232,6 +1385,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1241,6 +1395,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1250,6 +1405,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1259,6 +1415,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1268,6 +1425,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1277,6 +1435,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1286,6 +1445,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1295,6 +1455,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1304,6 +1465,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Offset</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1313,6 +1475,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1322,6 +1485,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Period</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1331,6 +1495,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Minimum Inter Arrival Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1340,15 +1505,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Periodic Event Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PERIODIC_EVENT_CONSTRAINT_FEATURE_COUNT = EVENT_CONSTRAINT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl <em>Pattern Event Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl
+	 * <em>Pattern Event Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getPatternEventConstraint()
 	 * @generated
@@ -1359,6 +1527,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1368,6 +1537,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1377,6 +1547,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1386,6 +1557,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1395,6 +1567,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1404,6 +1577,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1413,6 +1587,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1422,6 +1597,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1431,6 +1607,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1440,6 +1617,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Offset</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1449,6 +1627,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Period</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1458,6 +1637,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Minimum Inter Arrival Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1467,6 +1647,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Occurence</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1476,6 +1657,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Jitter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1485,15 +1667,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Pattern Event Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PATTERN_EVENT_CONSTRAINT_FEATURE_COUNT = EVENT_CONSTRAINT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl <em>Arbitrary Event Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl
+	 * <em>Arbitrary Event Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.TimingconstraintsPackageImpl#getArbitraryEventConstraint()
 	 * @generated
@@ -1504,6 +1689,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1513,6 +1699,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1522,6 +1709,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1531,6 +1719,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Mode</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1540,6 +1729,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Upper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1549,6 +1739,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Lower</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1558,6 +1749,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1567,6 +1759,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1576,6 +1769,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Event</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1585,6 +1779,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Offset</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1594,6 +1789,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Minimum Inter Arrival Time</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1603,6 +1799,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The feature id for the '<em><b>Maximum Inter Arrival Time</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1613,15 +1810,18 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * The number of structural features of the '<em>Arbitrary Event Constraint</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ARBITRARY_EVENT_CONSTRAINT_FEATURE_COUNT = EVENT_CONSTRAINT_FEATURE_COUNT + 2;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint <em>Age Timing Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint
+	 * <em>Age Timing Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Age Timing Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint
 	 * @generated
@@ -1629,9 +1829,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getAgeTimingConstraint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint <em>Arbitrary Event Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint
+	 * <em>Arbitrary Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Arbitrary Event Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint
 	 * @generated
@@ -1639,9 +1841,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getArbitraryEventConstraint();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMaximumInterArrivalTime
+	 * <em>Maximum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Maximum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMaximumInterArrivalTime()
 	 * @see #getArbitraryEventConstraint()
@@ -1650,9 +1855,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getArbitraryEventConstraint_MaximumInterArrivalTime();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Minimum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint#getMinimumInterArrivalTime()
 	 * @see #getArbitraryEventConstraint()
@@ -1664,6 +1872,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint <em>Delay Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Delay Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint
 	 * @generated
@@ -1671,9 +1880,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getDelayConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter <em>Jitter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter
+	 * <em>Jitter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Jitter</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getJitter()
 	 * @see #getDelayConstraint()
@@ -1682,9 +1893,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getDelayConstraint_Jitter();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal <em>Nominal</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal
+	 * <em>Nominal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Nominal</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getNominal()
 	 * @see #getDelayConstraint()
@@ -1693,9 +1906,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getDelayConstraint_Nominal();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope <em>Scope</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope <em>Scope</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Scope</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint#getScope()
 	 * @see #getDelayConstraint()
@@ -1707,6 +1922,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint <em>Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Event Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint
 	 * @generated
@@ -1714,9 +1930,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getEventConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent <em>Event</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent <em>Event</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Event</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getEvent()
 	 * @see #getEventConstraint()
@@ -1725,9 +1943,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getEventConstraint_Event();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset <em>Offset</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset
+	 * <em>Offset</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Offset</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint#getOffset()
 	 * @see #getEventConstraint()
@@ -1736,9 +1956,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getEventConstraint_Offset();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint <em>Input Synchronization Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint
+	 * <em>Input Synchronization Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Input Synchronization Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint
 	 * @generated
@@ -1746,9 +1968,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getInputSynchronizationConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth <em>Width</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth
+	 * <em>Width</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Width</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint#getWidth()
 	 * @see #getInputSynchronizationConstraint()
@@ -1757,9 +1981,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getInputSynchronizationConstraint_Width();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint <em>Output Synchronization Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint
+	 * <em>Output Synchronization Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Output Synchronization Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint
 	 * @generated
@@ -1767,9 +1993,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getOutputSynchronizationConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth <em>Width</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Width</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint#getWidth()
 	 * @see #getOutputSynchronizationConstraint()
@@ -1778,9 +2006,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getOutputSynchronizationConstraint_Width();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint <em>Pattern Event Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint
+	 * <em>Pattern Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Pattern Event Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint
 	 * @generated
@@ -1788,9 +2018,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getPatternEventConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter <em>Jitter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter
+	 * <em>Jitter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Jitter</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getJitter()
 	 * @see #getPatternEventConstraint()
@@ -1799,9 +2031,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPatternEventConstraint_Jitter();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Minimum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getMinimumInterArrivalTime()
 	 * @see #getPatternEventConstraint()
@@ -1810,9 +2045,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPatternEventConstraint_MinimumInterArrivalTime();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getOccurence <em>Occurence</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getOccurence <em>Occurence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Occurence</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getOccurence()
 	 * @see #getPatternEventConstraint()
@@ -1821,9 +2058,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPatternEventConstraint_Occurence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod <em>Period</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod
+	 * <em>Period</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Period</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint#getPeriod()
 	 * @see #getPatternEventConstraint()
@@ -1832,9 +2071,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPatternEventConstraint_Period();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint <em>Periodic Event Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint
+	 * <em>Periodic Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Periodic Event Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint
 	 * @generated
@@ -1842,9 +2083,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getPeriodicEventConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter <em>Jitter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter
+	 * <em>Jitter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Jitter</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getJitter()
 	 * @see #getPeriodicEventConstraint()
@@ -1853,9 +2096,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPeriodicEventConstraint_Jitter();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Minimum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getMinimumInterArrivalTime()
 	 * @see #getPeriodicEventConstraint()
@@ -1864,9 +2110,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPeriodicEventConstraint_MinimumInterArrivalTime();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod <em>Period</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod
+	 * <em>Period</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Period</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint#getPeriod()
 	 * @see #getPeriodicEventConstraint()
@@ -1875,9 +2123,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getPeriodicEventConstraint_Period();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint <em>Reaction Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint <em>Reaction Constraint</em>}
+	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Reaction Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint
 	 * @generated
@@ -1885,9 +2135,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getReactionConstraint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint <em>Sporadic Event Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint
+	 * <em>Sporadic Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Sporadic Event Constraint</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint
 	 * @generated
@@ -1895,9 +2147,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EClass getSporadicEventConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter <em>Jitter</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter
+	 * <em>Jitter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Jitter</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getJitter()
 	 * @see #getSporadicEventConstraint()
@@ -1906,9 +2160,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getSporadicEventConstraint_Jitter();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime
+	 * <em>Maximum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Maximum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMaximumInterArrivalTime()
 	 * @see #getSporadicEventConstraint()
@@ -1917,9 +2174,12 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getSporadicEventConstraint_MaximumInterArrivalTime();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}'.
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime
+	 * <em>Minimum Inter Arrival Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Minimum Inter Arrival Time</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getMinimumInterArrivalTime()
 	 * @see #getSporadicEventConstraint()
@@ -1928,9 +2188,11 @@ public interface TimingconstraintsPackage extends EPackage {
 	EReference getSporadicEventConstraint_MinimumInterArrivalTime();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod <em>Period</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod
+	 * <em>Period</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Period</em>'.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint#getPeriod()
 	 * @see #getSporadicEventConstraint()
@@ -1942,6 +2204,7 @@ public interface TimingconstraintsPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/AgeTimingConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/AgeTimingConstraintImpl.java
index cd1cf3421a0..9d44686acca 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/AgeTimingConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/AgeTimingConstraintImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class AgeTimingConstraintImpl extends DelayConstraintImpl implements AgeTimingConstraint {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AgeTimingConstraintImpl() {
@@ -42,6 +44,7 @@ public class AgeTimingConstraintImpl extends DelayConstraintImpl implements AgeT
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ArbitraryEventConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ArbitraryEventConstraintImpl.java
index 6538ecd2b97..4570d346ece 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ArbitraryEventConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ArbitraryEventConstraintImpl.java
@@ -32,18 +32,22 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter
+ * Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.ArbitraryEventConstraintImpl#getMaximumInterArrivalTime <em>Maximum Inter
+ * Arrival Time</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements ArbitraryEventConstraint {
+
 	/**
 	 * The cached value of the '{@link #getMinimumInterArrivalTime() <em>Minimum Inter Arrival Time</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -54,6 +58,7 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getMaximumInterArrivalTime() <em>Maximum Inter Arrival Time</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMaximumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -63,6 +68,7 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ArbitraryEventConstraintImpl() {
@@ -72,15 +78,16 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				return getMinimumInterArrivalTime();
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				return getMaximumInterArrivalTime();
+		switch(featureID) {
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			return getMinimumInterArrivalTime();
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			return getMaximumInterArrivalTime();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -88,15 +95,16 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				return minimumInterArrivalTime != null && !minimumInterArrivalTime.isEmpty();
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				return maximumInterArrivalTime != null && !maximumInterArrivalTime.isEmpty();
+		switch(featureID) {
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			return minimumInterArrivalTime != null && !minimumInterArrivalTime.isEmpty();
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			return maximumInterArrivalTime != null && !maximumInterArrivalTime.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -104,20 +112,21 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				getMinimumInterArrivalTime().clear();
-				getMinimumInterArrivalTime().addAll((Collection<? extends TimeDuration>)newValue);
-				return;
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				getMaximumInterArrivalTime().clear();
-				getMaximumInterArrivalTime().addAll((Collection<? extends TimeDuration>)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			getMinimumInterArrivalTime().clear();
+			getMinimumInterArrivalTime().addAll((Collection<? extends TimeDuration>)newValue);
+			return;
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			getMaximumInterArrivalTime().clear();
+			getMaximumInterArrivalTime().addAll((Collection<? extends TimeDuration>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -125,6 +134,7 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,17 +145,18 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				getMinimumInterArrivalTime().clear();
-				return;
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				getMaximumInterArrivalTime().clear();
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			getMinimumInterArrivalTime().clear();
+			return;
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			getMaximumInterArrivalTime().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -153,10 +164,11 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TimeDuration> getMaximumInterArrivalTime() {
-		if (maximumInterArrivalTime == null) {
+		if(maximumInterArrivalTime == null) {
 			maximumInterArrivalTime = new EObjectResolvingEList<TimeDuration>(TimeDuration.class, this, TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME);
 		}
 		return maximumInterArrivalTime;
@@ -165,10 +177,11 @@ public class ArbitraryEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TimeDuration> getMinimumInterArrivalTime() {
-		if (minimumInterArrivalTime == null) {
+		if(minimumInterArrivalTime == null) {
 			minimumInterArrivalTime = new EObjectResolvingEList<TimeDuration>(TimeDuration.class, this, TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME);
 		}
 		return minimumInterArrivalTime;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/DelayConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/DelayConstraintImpl.java
index 5940d33c0d6..1bf61a36c85 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/DelayConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/DelayConstraintImpl.java
@@ -33,19 +33,21 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getNominal <em>Nominal</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getScope <em>Scope</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getNominal <em>Nominal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.DelayConstraintImpl#getScope <em>Scope</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class DelayConstraintImpl extends TimingConstraintImpl implements DelayConstraint {
+
 	/**
 	 * The cached value of the '{@link #getJitter() <em>Jitter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJitter()
 	 * @generated
 	 * @ordered
@@ -56,6 +58,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	 * The cached value of the '{@link #getNominal() <em>Nominal</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getNominal()
 	 * @generated
 	 * @ordered
@@ -66,6 +69,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	 * The cached value of the '{@link #getScope() <em>Scope</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getScope()
 	 * @generated
 	 * @ordered
@@ -75,6 +79,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DelayConstraintImpl() {
@@ -84,6 +89,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetJitter() {
@@ -93,6 +99,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetNominal() {
@@ -102,6 +109,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventChain basicGetScope() {
@@ -111,20 +119,24 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
-				if (resolve) return getJitter();
-				return basicGetJitter();
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
-				if (resolve) return getNominal();
-				return basicGetNominal();
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
-				if (resolve) return getScope();
-				return basicGetScope();
+		switch(featureID) {
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
+			if(resolve)
+				return getJitter();
+			return basicGetJitter();
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
+			if(resolve)
+				return getNominal();
+			return basicGetNominal();
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
+			if(resolve)
+				return getScope();
+			return basicGetScope();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -132,17 +144,18 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
-				return jitter != null;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
-				return nominal != null;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
-				return scope != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
+			return jitter != null;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
+			return nominal != null;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
+			return scope != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -150,20 +163,21 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
-				setNominal((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
-				setScope((EventChain)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
+			setNominal((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
+			setScope((EventChain)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -171,6 +185,7 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,20 +196,21 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
-				setNominal((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
-				setScope((EventChain)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL:
+			setNominal((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE:
+			setScope((EventChain)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -202,14 +218,15 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getJitter() {
-		if (jitter != null && jitter.eIsProxy()) {
+		if(jitter != null && jitter.eIsProxy()) {
 			InternalEObject oldJitter = (InternalEObject)jitter;
 			jitter = (TimeDuration)eResolveProxy(oldJitter);
-			if (jitter != oldJitter) {
-				if (eNotificationRequired())
+			if(jitter != oldJitter) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER, oldJitter, jitter));
 			}
 		}
@@ -219,14 +236,15 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getNominal() {
-		if (nominal != null && nominal.eIsProxy()) {
+		if(nominal != null && nominal.eIsProxy()) {
 			InternalEObject oldNominal = (InternalEObject)nominal;
 			nominal = (TimeDuration)eResolveProxy(oldNominal);
-			if (nominal != oldNominal) {
-				if (eNotificationRequired())
+			if(nominal != oldNominal) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL, oldNominal, nominal));
 			}
 		}
@@ -236,14 +254,15 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EventChain getScope() {
-		if (scope != null && scope.eIsProxy()) {
+		if(scope != null && scope.eIsProxy()) {
 			InternalEObject oldScope = (InternalEObject)scope;
 			scope = (EventChain)eResolveProxy(oldScope);
-			if (scope != oldScope) {
-				if (eNotificationRequired())
+			if(scope != oldScope) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE, oldScope, scope));
 			}
 		}
@@ -253,36 +272,39 @@ public abstract class DelayConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJitter(TimeDuration newJitter) {
 		TimeDuration oldJitter = jitter;
 		jitter = newJitter;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.DELAY_CONSTRAINT__JITTER, oldJitter, jitter));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNominal(TimeDuration newNominal) {
 		TimeDuration oldNominal = nominal;
 		nominal = newNominal;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.DELAY_CONSTRAINT__NOMINAL, oldNominal, nominal));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setScope(EventChain newScope) {
 		EventChain oldScope = scope;
 		scope = newScope;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.DELAY_CONSTRAINT__SCOPE, oldScope, scope));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/EventConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/EventConstraintImpl.java
index 8f0f5d58ceb..23839753d17 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/EventConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/EventConstraintImpl.java
@@ -33,18 +33,20 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl#getEvent <em>Event</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl#getOffset <em>Offset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl#getEvent <em>Event</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.EventConstraintImpl#getOffset <em>Offset</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class EventConstraintImpl extends TimingConstraintImpl implements EventConstraint {
+
 	/**
 	 * The cached value of the '{@link #getEvent() <em>Event</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEvent()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	 * The cached value of the '{@link #getOffset() <em>Offset</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOffset()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EventConstraintImpl() {
@@ -73,6 +77,7 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event basicGetEvent() {
@@ -82,6 +87,7 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetOffset() {
@@ -91,17 +97,20 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
-				if (resolve) return getEvent();
-				return basicGetEvent();
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
-				if (resolve) return getOffset();
-				return basicGetOffset();
+		switch(featureID) {
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
+			if(resolve)
+				return getEvent();
+			return basicGetEvent();
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
+			if(resolve)
+				return getOffset();
+			return basicGetOffset();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -109,15 +118,16 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
-				return event != null;
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
-				return offset != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
+			return event != null;
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
+			return offset != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,17 +135,18 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
-				setEvent((Event)newValue);
-				return;
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
-				setOffset((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
+			setEvent((Event)newValue);
+			return;
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
+			setOffset((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -143,6 +154,7 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,17 +165,18 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
-				setEvent((Event)null);
-				return;
-			case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
-				setOffset((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT:
+			setEvent((Event)null);
+			return;
+		case TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET:
+			setOffset((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -171,14 +184,15 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Event getEvent() {
-		if (event != null && event.eIsProxy()) {
+		if(event != null && event.eIsProxy()) {
 			InternalEObject oldEvent = (InternalEObject)event;
 			event = (Event)eResolveProxy(oldEvent);
-			if (event != oldEvent) {
-				if (eNotificationRequired())
+			if(event != oldEvent) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT, oldEvent, event));
 			}
 		}
@@ -188,14 +202,15 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getOffset() {
-		if (offset != null && offset.eIsProxy()) {
+		if(offset != null && offset.eIsProxy()) {
 			InternalEObject oldOffset = (InternalEObject)offset;
 			offset = (TimeDuration)eResolveProxy(oldOffset);
-			if (offset != oldOffset) {
-				if (eNotificationRequired())
+			if(offset != oldOffset) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET, oldOffset, offset));
 			}
 		}
@@ -205,24 +220,26 @@ public abstract class EventConstraintImpl extends TimingConstraintImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEvent(Event newEvent) {
 		Event oldEvent = event;
 		event = newEvent;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.EVENT_CONSTRAINT__EVENT, oldEvent, event));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOffset(TimeDuration newOffset) {
 		TimeDuration oldOffset = offset;
 		offset = newOffset;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.EVENT_CONSTRAINT__OFFSET, oldOffset, offset));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/InputSynchronizationConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/InputSynchronizationConstraintImpl.java
index 2171df3791c..cf96155e144 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/InputSynchronizationConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/InputSynchronizationConstraintImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.InputSynchronizationConstraintImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl implements InputSynchronizationConstraint {
+
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected InputSynchronizationConstraintImpl() {
@@ -60,6 +63,7 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetWidth() {
@@ -69,14 +73,16 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				if (resolve) return getWidth();
-				return basicGetWidth();
+		switch(featureID) {
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			if(resolve)
+				return getWidth();
+			return basicGetWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				return width != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			return width != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				setWidth((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			setWidth((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				setWidth((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			setWidth((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getWidth() {
-		if (width != null && width.eIsProxy()) {
+		if(width != null && width.eIsProxy()) {
 			InternalEObject oldWidth = (InternalEObject)width;
 			width = (TimeDuration)eResolveProxy(oldWidth);
-			if (width != oldWidth) {
-				if (eNotificationRequired())
+			if(width != oldWidth) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH, oldWidth, width));
 			}
 		}
@@ -155,12 +166,13 @@ public class InputSynchronizationConstraintImpl extends AgeTimingConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(TimeDuration newWidth) {
 		TimeDuration oldWidth = width;
 		width = newWidth;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH, oldWidth, width));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/OutputSynchronizationConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/OutputSynchronizationConstraintImpl.java
index b4f44af7387..35966bec4cb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/OutputSynchronizationConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/OutputSynchronizationConstraintImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.OutputSynchronizationConstraintImpl#getWidth <em>Width</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl implements OutputSynchronizationConstraint {
+
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected OutputSynchronizationConstraintImpl() {
@@ -60,6 +63,7 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetWidth() {
@@ -69,14 +73,16 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				if (resolve) return getWidth();
-				return basicGetWidth();
+		switch(featureID) {
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			if(resolve)
+				return getWidth();
+			return basicGetWidth();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				return width != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			return width != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				setWidth((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			setWidth((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
-				setWidth((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH:
+			setWidth((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getWidth() {
-		if (width != null && width.eIsProxy()) {
+		if(width != null && width.eIsProxy()) {
 			InternalEObject oldWidth = (InternalEObject)width;
 			width = (TimeDuration)eResolveProxy(oldWidth);
-			if (width != oldWidth) {
-				if (eNotificationRequired())
+			if(width != oldWidth) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH, oldWidth, width));
 			}
 		}
@@ -155,12 +166,13 @@ public class OutputSynchronizationConstraintImpl extends ReactionConstraintImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(TimeDuration newWidth) {
 		TimeDuration oldWidth = width;
 		width = newWidth;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT__WIDTH, oldWidth, width));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PatternEventConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PatternEventConstraintImpl.java
index b7534f1542c..3923ab01b82 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PatternEventConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PatternEventConstraintImpl.java
@@ -35,20 +35,23 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getOccurence <em>Occurence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter
+ * Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getOccurence <em>Occurence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PatternEventConstraintImpl#getJitter <em>Jitter</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PatternEventConstraintImpl extends EventConstraintImpl implements PatternEventConstraint {
+
 	/**
 	 * The cached value of the '{@link #getPeriod() <em>Period</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPeriod()
 	 * @generated
 	 * @ordered
@@ -59,6 +62,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	 * The cached value of the '{@link #getMinimumInterArrivalTime() <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -69,6 +73,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	 * The cached value of the '{@link #getOccurence() <em>Occurence</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOccurence()
 	 * @generated
 	 * @ordered
@@ -79,6 +84,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	 * The cached value of the '{@link #getJitter() <em>Jitter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJitter()
 	 * @generated
 	 * @ordered
@@ -88,6 +94,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PatternEventConstraintImpl() {
@@ -97,6 +104,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetJitter() {
@@ -106,6 +114,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetMinimumInterArrivalTime() {
@@ -115,6 +124,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetPeriod() {
@@ -124,22 +134,26 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
-				if (resolve) return getPeriod();
-				return basicGetPeriod();
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				if (resolve) return getMinimumInterArrivalTime();
-				return basicGetMinimumInterArrivalTime();
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
-				return getOccurence();
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
-				if (resolve) return getJitter();
-				return basicGetJitter();
+		switch(featureID) {
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
+			if(resolve)
+				return getPeriod();
+			return basicGetPeriod();
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			if(resolve)
+				return getMinimumInterArrivalTime();
+			return basicGetMinimumInterArrivalTime();
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
+			return getOccurence();
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
+			if(resolve)
+				return getJitter();
+			return basicGetJitter();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -147,19 +161,20 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
-				return period != null;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				return minimumInterArrivalTime != null;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
-				return occurence != null && !occurence.isEmpty();
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
-				return jitter != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
+			return period != null;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			return minimumInterArrivalTime != null;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
+			return occurence != null && !occurence.isEmpty();
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
+			return jitter != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -167,25 +182,26 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
-				getOccurence().clear();
-				getOccurence().addAll((Collection<? extends TimeDuration>)newValue);
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
+			getOccurence().clear();
+			getOccurence().addAll((Collection<? extends TimeDuration>)newValue);
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -193,6 +209,7 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -203,23 +220,24 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
-				getOccurence().clear();
-				return;
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE:
+			getOccurence().clear();
+			return;
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -227,14 +245,15 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getJitter() {
-		if (jitter != null && jitter.eIsProxy()) {
+		if(jitter != null && jitter.eIsProxy()) {
 			InternalEObject oldJitter = (InternalEObject)jitter;
 			jitter = (TimeDuration)eResolveProxy(oldJitter);
-			if (jitter != oldJitter) {
-				if (eNotificationRequired())
+			if(jitter != oldJitter) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 			}
 		}
@@ -244,14 +263,15 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getMinimumInterArrivalTime() {
-		if (minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
+		if(minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
 			InternalEObject oldMinimumInterArrivalTime = (InternalEObject)minimumInterArrivalTime;
 			minimumInterArrivalTime = (TimeDuration)eResolveProxy(oldMinimumInterArrivalTime);
-			if (minimumInterArrivalTime != oldMinimumInterArrivalTime) {
-				if (eNotificationRequired())
+			if(minimumInterArrivalTime != oldMinimumInterArrivalTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 			}
 		}
@@ -261,10 +281,11 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TimeDuration> getOccurence() {
-		if (occurence == null) {
+		if(occurence == null) {
 			occurence = new EObjectResolvingEList<TimeDuration>(TimeDuration.class, this, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__OCCURENCE);
 		}
 		return occurence;
@@ -273,14 +294,15 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getPeriod() {
-		if (period != null && period.eIsProxy()) {
+		if(period != null && period.eIsProxy()) {
 			InternalEObject oldPeriod = (InternalEObject)period;
 			period = (TimeDuration)eResolveProxy(oldPeriod);
-			if (period != oldPeriod) {
-				if (eNotificationRequired())
+			if(period != oldPeriod) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 			}
 		}
@@ -290,36 +312,39 @@ public class PatternEventConstraintImpl extends EventConstraintImpl implements P
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJitter(TimeDuration newJitter) {
 		TimeDuration oldJitter = jitter;
 		jitter = newJitter;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMinimumInterArrivalTime(TimeDuration newMinimumInterArrivalTime) {
 		TimeDuration oldMinimumInterArrivalTime = minimumInterArrivalTime;
 		minimumInterArrivalTime = newMinimumInterArrivalTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPeriod(TimeDuration newPeriod) {
 		TimeDuration oldPeriod = period;
 		period = newPeriod;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PeriodicEventConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PeriodicEventConstraintImpl.java
index 8929e3f2e7b..88755bc7cb8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PeriodicEventConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/PeriodicEventConstraintImpl.java
@@ -31,19 +31,22 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.PeriodicEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter
+ * Arrival Time</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PeriodicEventConstraintImpl extends EventConstraintImpl implements PeriodicEventConstraint {
+
 	/**
 	 * The cached value of the '{@link #getJitter() <em>Jitter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJitter()
 	 * @generated
 	 * @ordered
@@ -54,6 +57,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getPeriod() <em>Period</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPeriod()
 	 * @generated
 	 * @ordered
@@ -64,6 +68,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getMinimumInterArrivalTime() <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -73,6 +78,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PeriodicEventConstraintImpl() {
@@ -82,6 +88,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetJitter() {
@@ -91,6 +98,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetMinimumInterArrivalTime() {
@@ -100,6 +108,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetPeriod() {
@@ -109,20 +118,24 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
-				if (resolve) return getJitter();
-				return basicGetJitter();
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
-				if (resolve) return getPeriod();
-				return basicGetPeriod();
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				if (resolve) return getMinimumInterArrivalTime();
-				return basicGetMinimumInterArrivalTime();
+		switch(featureID) {
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
+			if(resolve)
+				return getJitter();
+			return basicGetJitter();
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
+			if(resolve)
+				return getPeriod();
+			return basicGetPeriod();
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			if(resolve)
+				return getMinimumInterArrivalTime();
+			return basicGetMinimumInterArrivalTime();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -130,17 +143,18 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
-				return jitter != null;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
-				return period != null;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				return minimumInterArrivalTime != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
+			return jitter != null;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
+			return period != null;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			return minimumInterArrivalTime != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -148,20 +162,21 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -169,6 +184,7 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,20 +195,21 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -200,14 +217,15 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getJitter() {
-		if (jitter != null && jitter.eIsProxy()) {
+		if(jitter != null && jitter.eIsProxy()) {
 			InternalEObject oldJitter = (InternalEObject)jitter;
 			jitter = (TimeDuration)eResolveProxy(oldJitter);
-			if (jitter != oldJitter) {
-				if (eNotificationRequired())
+			if(jitter != oldJitter) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 			}
 		}
@@ -217,14 +235,15 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getMinimumInterArrivalTime() {
-		if (minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
+		if(minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
 			InternalEObject oldMinimumInterArrivalTime = (InternalEObject)minimumInterArrivalTime;
 			minimumInterArrivalTime = (TimeDuration)eResolveProxy(oldMinimumInterArrivalTime);
-			if (minimumInterArrivalTime != oldMinimumInterArrivalTime) {
-				if (eNotificationRequired())
+			if(minimumInterArrivalTime != oldMinimumInterArrivalTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 			}
 		}
@@ -234,14 +253,15 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getPeriod() {
-		if (period != null && period.eIsProxy()) {
+		if(period != null && period.eIsProxy()) {
 			InternalEObject oldPeriod = (InternalEObject)period;
 			period = (TimeDuration)eResolveProxy(oldPeriod);
-			if (period != oldPeriod) {
-				if (eNotificationRequired())
+			if(period != oldPeriod) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 			}
 		}
@@ -251,36 +271,39 @@ public class PeriodicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJitter(TimeDuration newJitter) {
 		TimeDuration oldJitter = jitter;
 		jitter = newJitter;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMinimumInterArrivalTime(TimeDuration newMinimumInterArrivalTime) {
 		TimeDuration oldMinimumInterArrivalTime = minimumInterArrivalTime;
 		minimumInterArrivalTime = newMinimumInterArrivalTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPeriod(TimeDuration newPeriod) {
 		TimeDuration oldPeriod = period;
 		period = newPeriod;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ReactionConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ReactionConstraintImpl.java
index 99f4063710a..48082d72bb2 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ReactionConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/ReactionConstraintImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ReactionConstraintImpl extends DelayConstraintImpl implements ReactionConstraint {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ReactionConstraintImpl() {
@@ -42,6 +44,7 @@ public class ReactionConstraintImpl extends DelayConstraintImpl implements React
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/SporadicEventConstraintImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/SporadicEventConstraintImpl.java
index 8356de0e666..97210c31b04 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/SporadicEventConstraintImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/SporadicEventConstraintImpl.java
@@ -31,20 +31,24 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getJitter <em>Jitter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getPeriod <em>Period</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getMaximumInterArrivalTime <em>Maximum Inter Arrival Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getJitter <em>Jitter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getPeriod <em>Period</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getMaximumInterArrivalTime <em>Maximum Inter
+ * Arrival Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.impl.SporadicEventConstraintImpl#getMinimumInterArrivalTime <em>Minimum Inter
+ * Arrival Time</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SporadicEventConstraintImpl extends EventConstraintImpl implements SporadicEventConstraint {
+
 	/**
 	 * The cached value of the '{@link #getJitter() <em>Jitter</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getJitter()
 	 * @generated
 	 * @ordered
@@ -55,6 +59,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getPeriod() <em>Period</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPeriod()
 	 * @generated
 	 * @ordered
@@ -65,6 +70,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getMaximumInterArrivalTime() <em>Maximum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMaximumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -75,6 +81,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	 * The cached value of the '{@link #getMinimumInterArrivalTime() <em>Minimum Inter Arrival Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getMinimumInterArrivalTime()
 	 * @generated
 	 * @ordered
@@ -84,6 +91,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SporadicEventConstraintImpl() {
@@ -93,6 +101,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetJitter() {
@@ -102,6 +111,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetMaximumInterArrivalTime() {
@@ -111,6 +121,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetMinimumInterArrivalTime() {
@@ -120,6 +131,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration basicGetPeriod() {
@@ -129,23 +141,28 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
-				if (resolve) return getJitter();
-				return basicGetJitter();
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
-				if (resolve) return getPeriod();
-				return basicGetPeriod();
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				if (resolve) return getMaximumInterArrivalTime();
-				return basicGetMaximumInterArrivalTime();
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				if (resolve) return getMinimumInterArrivalTime();
-				return basicGetMinimumInterArrivalTime();
+		switch(featureID) {
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
+			if(resolve)
+				return getJitter();
+			return basicGetJitter();
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
+			if(resolve)
+				return getPeriod();
+			return basicGetPeriod();
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			if(resolve)
+				return getMaximumInterArrivalTime();
+			return basicGetMaximumInterArrivalTime();
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			if(resolve)
+				return getMinimumInterArrivalTime();
+			return basicGetMinimumInterArrivalTime();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -153,19 +170,20 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
-				return jitter != null;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
-				return period != null;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				return maximumInterArrivalTime != null;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				return minimumInterArrivalTime != null;
+		switch(featureID) {
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
+			return jitter != null;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
+			return period != null;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			return maximumInterArrivalTime != null;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			return minimumInterArrivalTime != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -173,23 +191,24 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				setMaximumInterArrivalTime((TimeDuration)newValue);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)newValue);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			setMaximumInterArrivalTime((TimeDuration)newValue);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -197,6 +216,7 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -207,23 +227,24 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
-				setJitter((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
-				setPeriod((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
-				setMaximumInterArrivalTime((TimeDuration)null);
-				return;
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
-				setMinimumInterArrivalTime((TimeDuration)null);
-				return;
+		switch(featureID) {
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER:
+			setJitter((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD:
+			setPeriod((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME:
+			setMaximumInterArrivalTime((TimeDuration)null);
+			return;
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME:
+			setMinimumInterArrivalTime((TimeDuration)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -231,14 +252,15 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getJitter() {
-		if (jitter != null && jitter.eIsProxy()) {
+		if(jitter != null && jitter.eIsProxy()) {
 			InternalEObject oldJitter = (InternalEObject)jitter;
 			jitter = (TimeDuration)eResolveProxy(oldJitter);
-			if (jitter != oldJitter) {
-				if (eNotificationRequired())
+			if(jitter != oldJitter) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 			}
 		}
@@ -248,14 +270,15 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getMaximumInterArrivalTime() {
-		if (maximumInterArrivalTime != null && maximumInterArrivalTime.eIsProxy()) {
+		if(maximumInterArrivalTime != null && maximumInterArrivalTime.eIsProxy()) {
 			InternalEObject oldMaximumInterArrivalTime = (InternalEObject)maximumInterArrivalTime;
 			maximumInterArrivalTime = (TimeDuration)eResolveProxy(oldMaximumInterArrivalTime);
-			if (maximumInterArrivalTime != oldMaximumInterArrivalTime) {
-				if (eNotificationRequired())
+			if(maximumInterArrivalTime != oldMaximumInterArrivalTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME, oldMaximumInterArrivalTime, maximumInterArrivalTime));
 			}
 		}
@@ -265,14 +288,15 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getMinimumInterArrivalTime() {
-		if (minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
+		if(minimumInterArrivalTime != null && minimumInterArrivalTime.eIsProxy()) {
 			InternalEObject oldMinimumInterArrivalTime = (InternalEObject)minimumInterArrivalTime;
 			minimumInterArrivalTime = (TimeDuration)eResolveProxy(oldMinimumInterArrivalTime);
-			if (minimumInterArrivalTime != oldMinimumInterArrivalTime) {
-				if (eNotificationRequired())
+			if(minimumInterArrivalTime != oldMinimumInterArrivalTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 			}
 		}
@@ -282,14 +306,15 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimeDuration getPeriod() {
-		if (period != null && period.eIsProxy()) {
+		if(period != null && period.eIsProxy()) {
 			InternalEObject oldPeriod = (InternalEObject)period;
 			period = (TimeDuration)eResolveProxy(oldPeriod);
-			if (period != oldPeriod) {
-				if (eNotificationRequired())
+			if(period != oldPeriod) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 			}
 		}
@@ -299,48 +324,52 @@ public class SporadicEventConstraintImpl extends EventConstraintImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setJitter(TimeDuration newJitter) {
 		TimeDuration oldJitter = jitter;
 		jitter = newJitter;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__JITTER, oldJitter, jitter));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMaximumInterArrivalTime(TimeDuration newMaximumInterArrivalTime) {
 		TimeDuration oldMaximumInterArrivalTime = maximumInterArrivalTime;
 		maximumInterArrivalTime = newMaximumInterArrivalTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MAXIMUM_INTER_ARRIVAL_TIME, oldMaximumInterArrivalTime, maximumInterArrivalTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMinimumInterArrivalTime(TimeDuration newMinimumInterArrivalTime) {
 		TimeDuration oldMinimumInterArrivalTime = minimumInterArrivalTime;
 		minimumInterArrivalTime = newMinimumInterArrivalTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__MINIMUM_INTER_ARRIVAL_TIME, oldMinimumInterArrivalTime, minimumInterArrivalTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPeriod(TimeDuration newPeriod) {
 		TimeDuration oldPeriod = period;
 		period = newPeriod;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT__PERIOD, oldPeriod, period));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsFactoryImpl.java
index 8eaca93e45c..9e8c4024da8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.eastadl.timing.timingconstraints.*;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint;
@@ -36,12 +37,15 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingconstraintsFactoryImpl extends EFactoryImpl implements TimingconstraintsFactory {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -54,16 +58,16 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TimingconstraintsFactory init() {
 		try {
 			TimingconstraintsFactory theTimingconstraintsFactory = (TimingconstraintsFactory)EPackage.Registry.INSTANCE.getEFactory(TimingconstraintsPackage.eNS_URI);
-			if (theTimingconstraintsFactory != null) {
+			if(theTimingconstraintsFactory != null) {
 				return theTimingconstraintsFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new TimingconstraintsFactoryImpl();
@@ -73,6 +77,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsFactoryImpl() {
@@ -82,27 +87,37 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TimingconstraintsPackage.AGE_TIMING_CONSTRAINT: return createAgeTimingConstraint();
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT: return createInputSynchronizationConstraint();
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT: return createOutputSynchronizationConstraint();
-			case TimingconstraintsPackage.REACTION_CONSTRAINT: return createReactionConstraint();
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT: return createSporadicEventConstraint();
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT: return createPeriodicEventConstraint();
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT: return createPatternEventConstraint();
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT: return createArbitraryEventConstraint();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case TimingconstraintsPackage.AGE_TIMING_CONSTRAINT:
+			return createAgeTimingConstraint();
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT:
+			return createInputSynchronizationConstraint();
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT:
+			return createOutputSynchronizationConstraint();
+		case TimingconstraintsPackage.REACTION_CONSTRAINT:
+			return createReactionConstraint();
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT:
+			return createSporadicEventConstraint();
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT:
+			return createPeriodicEventConstraint();
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT:
+			return createPatternEventConstraint();
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT:
+			return createArbitraryEventConstraint();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AgeTimingConstraint createAgeTimingConstraint() {
@@ -113,6 +128,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ArbitraryEventConstraint createArbitraryEventConstraint() {
@@ -123,6 +139,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InputSynchronizationConstraint createInputSynchronizationConstraint() {
@@ -133,6 +150,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OutputSynchronizationConstraint createOutputSynchronizationConstraint() {
@@ -143,6 +161,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PatternEventConstraint createPatternEventConstraint() {
@@ -153,6 +172,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PeriodicEventConstraint createPeriodicEventConstraint() {
@@ -163,6 +183,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReactionConstraint createReactionConstraint() {
@@ -173,6 +194,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SporadicEventConstraint createSporadicEventConstraint() {
@@ -183,6 +205,7 @@ public class TimingconstraintsFactoryImpl extends EFactoryImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsPackage getTimingconstraintsPackage() {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsPackageImpl.java
index 3dab8ab7239..620c66dca97 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/impl/TimingconstraintsPackageImpl.java
@@ -91,6 +91,7 @@ import org.eclipse.papyrus.sysml.SysmlPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingconstraintsPackageImpl extends EPackageImpl implements TimingconstraintsPackage {
@@ -98,6 +99,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass delayConstraintEClass = null;
@@ -105,6 +107,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass ageTimingConstraintEClass = null;
@@ -112,6 +115,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass eventConstraintEClass = null;
@@ -119,6 +123,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass inputSynchronizationConstraintEClass = null;
@@ -126,6 +131,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass outputSynchronizationConstraintEClass = null;
@@ -133,6 +139,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass reactionConstraintEClass = null;
@@ -140,6 +147,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass sporadicEventConstraintEClass = null;
@@ -147,6 +155,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass periodicEventConstraintEClass = null;
@@ -154,6 +163,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass patternEventConstraintEClass = null;
@@ -161,6 +171,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass arbitraryEventConstraintEClass = null;
@@ -168,6 +179,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -175,16 +187,18 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * 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 TimingconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link TimingconstraintsPackage#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 --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static TimingconstraintsPackage init() {
-		if (isInited) return (TimingconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(TimingconstraintsPackage.eNS_URI);
+		if(isInited)
+			return (TimingconstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(TimingconstraintsPackage.eNS_URI);
 
 		// Obtain or create and register package
 		TimingconstraintsPackageImpl theTimingconstraintsPackage = (TimingconstraintsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TimingconstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TimingconstraintsPackageImpl());
@@ -286,7 +300,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 		// Mark meta-data to indicate it can't be changed
 		theTimingconstraintsPackage.freeze();
 
-  
+
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(TimingconstraintsPackage.eNS_URI, theTimingconstraintsPackage);
 		return theTimingconstraintsPackage;
@@ -295,6 +309,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -302,19 +317,19 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage#eNS_URI
 	 * @see #init()
@@ -325,14 +340,16 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	}
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -380,6 +397,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAgeTimingConstraint() {
@@ -389,6 +407,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getArbitraryEventConstraint() {
@@ -398,6 +417,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getArbitraryEventConstraint_MaximumInterArrivalTime() {
@@ -407,6 +427,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getArbitraryEventConstraint_MinimumInterArrivalTime() {
@@ -416,6 +437,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDelayConstraint() {
@@ -425,6 +447,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDelayConstraint_Jitter() {
@@ -434,6 +457,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDelayConstraint_Nominal() {
@@ -443,6 +467,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDelayConstraint_Scope() {
@@ -452,6 +477,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEventConstraint() {
@@ -461,6 +487,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventConstraint_Event() {
@@ -470,6 +497,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEventConstraint_Offset() {
@@ -479,6 +507,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getInputSynchronizationConstraint() {
@@ -488,6 +517,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getInputSynchronizationConstraint_Width() {
@@ -497,6 +527,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getOutputSynchronizationConstraint() {
@@ -506,6 +537,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getOutputSynchronizationConstraint_Width() {
@@ -515,6 +547,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPatternEventConstraint() {
@@ -524,6 +557,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPatternEventConstraint_Jitter() {
@@ -533,6 +567,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPatternEventConstraint_MinimumInterArrivalTime() {
@@ -542,6 +577,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPatternEventConstraint_Occurence() {
@@ -551,6 +587,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPatternEventConstraint_Period() {
@@ -560,6 +597,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPeriodicEventConstraint() {
@@ -569,6 +607,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPeriodicEventConstraint_Jitter() {
@@ -578,6 +617,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPeriodicEventConstraint_MinimumInterArrivalTime() {
@@ -587,6 +627,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPeriodicEventConstraint_Period() {
@@ -596,6 +637,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getReactionConstraint() {
@@ -605,6 +647,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSporadicEventConstraint() {
@@ -614,6 +657,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSporadicEventConstraint_Jitter() {
@@ -623,6 +667,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSporadicEventConstraint_MaximumInterArrivalTime() {
@@ -632,6 +677,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSporadicEventConstraint_MinimumInterArrivalTime() {
@@ -641,6 +687,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getSporadicEventConstraint_Period() {
@@ -650,6 +697,7 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsFactory getTimingconstraintsFactory() {
@@ -657,14 +705,16 @@ public class TimingconstraintsPackageImpl extends EPackageImpl implements Timing
 	}
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsAdapterFactory.java
index 89575969e79..a65467a7d3d 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 import org.eclipse.papyrus.eastadl.timing.TimingConstraint;
+import org.eclipse.papyrus.eastadl.timing.timingconstraints.*;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint;
@@ -39,14 +40,17 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage
  * @generated
  */
 public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static TimingconstraintsPackage modelPackage;
@@ -55,72 +59,86 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected TimingconstraintsSwitch<Adapter> modelSwitch =
-		new TimingconstraintsSwitch<Adapter>() {
-			@Override
-			public Adapter caseDelayConstraint(DelayConstraint object) {
-				return createDelayConstraintAdapter();
-			}
-			@Override
-			public Adapter caseAgeTimingConstraint(AgeTimingConstraint object) {
-				return createAgeTimingConstraintAdapter();
-			}
-			@Override
-			public Adapter caseEventConstraint(EventConstraint object) {
-				return createEventConstraintAdapter();
-			}
-			@Override
-			public Adapter caseInputSynchronizationConstraint(InputSynchronizationConstraint object) {
-				return createInputSynchronizationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseOutputSynchronizationConstraint(OutputSynchronizationConstraint object) {
-				return createOutputSynchronizationConstraintAdapter();
-			}
-			@Override
-			public Adapter caseReactionConstraint(ReactionConstraint object) {
-				return createReactionConstraintAdapter();
-			}
-			@Override
-			public Adapter caseSporadicEventConstraint(SporadicEventConstraint object) {
-				return createSporadicEventConstraintAdapter();
-			}
-			@Override
-			public Adapter casePeriodicEventConstraint(PeriodicEventConstraint object) {
-				return createPeriodicEventConstraintAdapter();
-			}
-			@Override
-			public Adapter casePatternEventConstraint(PatternEventConstraint object) {
-				return createPatternEventConstraintAdapter();
-			}
-			@Override
-			public Adapter caseArbitraryEventConstraint(ArbitraryEventConstraint object) {
-				return createArbitraryEventConstraintAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseTimingConstraint(TimingConstraint object) {
-				return createTimingConstraintAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected TimingconstraintsSwitch<Adapter> modelSwitch = new TimingconstraintsSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseDelayConstraint(DelayConstraint object) {
+			return createDelayConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseAgeTimingConstraint(AgeTimingConstraint object) {
+			return createAgeTimingConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseEventConstraint(EventConstraint object) {
+			return createEventConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseInputSynchronizationConstraint(InputSynchronizationConstraint object) {
+			return createInputSynchronizationConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseOutputSynchronizationConstraint(OutputSynchronizationConstraint object) {
+			return createOutputSynchronizationConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseReactionConstraint(ReactionConstraint object) {
+			return createReactionConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseSporadicEventConstraint(SporadicEventConstraint object) {
+			return createSporadicEventConstraintAdapter();
+		}
+
+		@Override
+		public Adapter casePeriodicEventConstraint(PeriodicEventConstraint object) {
+			return createPeriodicEventConstraintAdapter();
+		}
+
+		@Override
+		public Adapter casePatternEventConstraint(PatternEventConstraint object) {
+			return createPatternEventConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseArbitraryEventConstraint(ArbitraryEventConstraint object) {
+			return createArbitraryEventConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTimingConstraint(TimingConstraint object) {
+			return createTimingConstraintAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = TimingconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -129,7 +147,9 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -139,11 +159,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint <em>Age Timing Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint
+	 * <em>Age Timing Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint
 	 * @generated
@@ -154,11 +176,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint <em>Arbitrary Event Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint
+	 * <em>Arbitrary Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint
 	 * @generated
@@ -173,6 +197,7 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -182,11 +207,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint <em>Delay Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint
+	 * <em>Delay Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint
 	 * @generated
@@ -200,6 +227,7 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -208,11 +236,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint <em>Event Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint
+	 * <em>Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.EventConstraint
 	 * @generated
@@ -222,11 +252,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint <em>Input Synchronization Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint
+	 * <em>Input Synchronization Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.InputSynchronizationConstraint
 	 * @generated
@@ -236,11 +268,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint <em>Output Synchronization Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint
+	 * <em>Output Synchronization Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.OutputSynchronizationConstraint
 	 * @generated
@@ -250,11 +284,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint <em>Pattern Event Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint
+	 * <em>Pattern Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PatternEventConstraint
 	 * @generated
@@ -264,11 +300,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint <em>Periodic Event Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint
+	 * <em>Periodic Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.PeriodicEventConstraint
 	 * @generated
@@ -278,11 +316,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint <em>Reaction Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint
+	 * <em>Reaction Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.ReactionConstraint
 	 * @generated
@@ -292,11 +332,13 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint <em>Sporadic Event Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint
+	 * <em>Sporadic Event Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.SporadicEventConstraint
 	 * @generated
@@ -311,6 +353,7 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint
 	 * @generated
@@ -324,15 +367,16 @@ public class TimingconstraintsAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceFactoryImpl.java
index bb59d3a6374..ffd141f56e4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceFactoryImpl.java
@@ -24,14 +24,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.util.TimingconstraintsResourceImpl
  * @generated
  */
 public class TimingconstraintsResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsResourceFactoryImpl() {
@@ -42,6 +45,7 @@ public class TimingconstraintsResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceImpl.java
index 647649d7f37..ff51f24f544 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsResourceImpl.java
@@ -22,15 +22,19 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.util.TimingconstraintsResourceFactoryImpl
  * @generated
  */
 public class TimingconstraintsResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public TimingconstraintsResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsSwitch.java
index 42b7063477f..94fdb5ea172 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
 import org.eclipse.papyrus.eastadl.timing.TimingConstraint;
+import org.eclipse.papyrus.eastadl.timing.timingconstraints.*;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.AgeTimingConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.ArbitraryEventConstraint;
 import org.eclipse.papyrus.eastadl.timing.timingconstraints.DelayConstraint;
@@ -36,21 +37,23 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPackage
  * @generated
  */
 public class TimingconstraintsSwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static TimingconstraintsPackage modelPackage;
@@ -59,10 +62,11 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = TimingconstraintsPackage.eINSTANCE;
 		}
 	}
@@ -71,6 +75,7 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -86,7 +91,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Age Timing Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -101,7 +108,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Arbitrary Event Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -116,7 +125,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -131,7 +142,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Delay Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -146,7 +159,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -161,7 +176,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Input Synchronization Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -176,7 +193,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Output Synchronization Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -191,7 +210,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Pattern Event Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -206,7 +227,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Periodic Event Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -221,7 +244,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Reaction Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -236,7 +261,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Sporadic Event Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -251,7 +278,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -266,7 +295,9 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -280,103 +311,155 @@ public class TimingconstraintsSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TimingconstraintsPackage.DELAY_CONSTRAINT: {
-				DelayConstraint delayConstraint = (DelayConstraint)theEObject;
-				T result = caseDelayConstraint(delayConstraint);
-				if (result == null) result = caseTimingConstraint(delayConstraint);
-				if (result == null) result = caseEAElement(delayConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.AGE_TIMING_CONSTRAINT: {
-				AgeTimingConstraint ageTimingConstraint = (AgeTimingConstraint)theEObject;
-				T result = caseAgeTimingConstraint(ageTimingConstraint);
-				if (result == null) result = caseDelayConstraint(ageTimingConstraint);
-				if (result == null) result = caseTimingConstraint(ageTimingConstraint);
-				if (result == null) result = caseEAElement(ageTimingConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.EVENT_CONSTRAINT: {
-				EventConstraint eventConstraint = (EventConstraint)theEObject;
-				T result = caseEventConstraint(eventConstraint);
-				if (result == null) result = caseTimingConstraint(eventConstraint);
-				if (result == null) result = caseEAElement(eventConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT: {
-				InputSynchronizationConstraint inputSynchronizationConstraint = (InputSynchronizationConstraint)theEObject;
-				T result = caseInputSynchronizationConstraint(inputSynchronizationConstraint);
-				if (result == null) result = caseAgeTimingConstraint(inputSynchronizationConstraint);
-				if (result == null) result = caseDelayConstraint(inputSynchronizationConstraint);
-				if (result == null) result = caseTimingConstraint(inputSynchronizationConstraint);
-				if (result == null) result = caseEAElement(inputSynchronizationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT: {
-				OutputSynchronizationConstraint outputSynchronizationConstraint = (OutputSynchronizationConstraint)theEObject;
-				T result = caseOutputSynchronizationConstraint(outputSynchronizationConstraint);
-				if (result == null) result = caseReactionConstraint(outputSynchronizationConstraint);
-				if (result == null) result = caseDelayConstraint(outputSynchronizationConstraint);
-				if (result == null) result = caseTimingConstraint(outputSynchronizationConstraint);
-				if (result == null) result = caseEAElement(outputSynchronizationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.REACTION_CONSTRAINT: {
-				ReactionConstraint reactionConstraint = (ReactionConstraint)theEObject;
-				T result = caseReactionConstraint(reactionConstraint);
-				if (result == null) result = caseDelayConstraint(reactionConstraint);
-				if (result == null) result = caseTimingConstraint(reactionConstraint);
-				if (result == null) result = caseEAElement(reactionConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT: {
-				SporadicEventConstraint sporadicEventConstraint = (SporadicEventConstraint)theEObject;
-				T result = caseSporadicEventConstraint(sporadicEventConstraint);
-				if (result == null) result = caseEventConstraint(sporadicEventConstraint);
-				if (result == null) result = caseTimingConstraint(sporadicEventConstraint);
-				if (result == null) result = caseEAElement(sporadicEventConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT: {
-				PeriodicEventConstraint periodicEventConstraint = (PeriodicEventConstraint)theEObject;
-				T result = casePeriodicEventConstraint(periodicEventConstraint);
-				if (result == null) result = caseEventConstraint(periodicEventConstraint);
-				if (result == null) result = caseTimingConstraint(periodicEventConstraint);
-				if (result == null) result = caseEAElement(periodicEventConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT: {
-				PatternEventConstraint patternEventConstraint = (PatternEventConstraint)theEObject;
-				T result = casePatternEventConstraint(patternEventConstraint);
-				if (result == null) result = caseEventConstraint(patternEventConstraint);
-				if (result == null) result = caseTimingConstraint(patternEventConstraint);
-				if (result == null) result = caseEAElement(patternEventConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT: {
-				ArbitraryEventConstraint arbitraryEventConstraint = (ArbitraryEventConstraint)theEObject;
-				T result = caseArbitraryEventConstraint(arbitraryEventConstraint);
-				if (result == null) result = caseEventConstraint(arbitraryEventConstraint);
-				if (result == null) result = caseTimingConstraint(arbitraryEventConstraint);
-				if (result == null) result = caseEAElement(arbitraryEventConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case TimingconstraintsPackage.DELAY_CONSTRAINT:
+		{
+			DelayConstraint delayConstraint = (DelayConstraint)theEObject;
+			T result = caseDelayConstraint(delayConstraint);
+			if(result == null)
+				result = caseTimingConstraint(delayConstraint);
+			if(result == null)
+				result = caseEAElement(delayConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.AGE_TIMING_CONSTRAINT:
+		{
+			AgeTimingConstraint ageTimingConstraint = (AgeTimingConstraint)theEObject;
+			T result = caseAgeTimingConstraint(ageTimingConstraint);
+			if(result == null)
+				result = caseDelayConstraint(ageTimingConstraint);
+			if(result == null)
+				result = caseTimingConstraint(ageTimingConstraint);
+			if(result == null)
+				result = caseEAElement(ageTimingConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.EVENT_CONSTRAINT:
+		{
+			EventConstraint eventConstraint = (EventConstraint)theEObject;
+			T result = caseEventConstraint(eventConstraint);
+			if(result == null)
+				result = caseTimingConstraint(eventConstraint);
+			if(result == null)
+				result = caseEAElement(eventConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.INPUT_SYNCHRONIZATION_CONSTRAINT:
+		{
+			InputSynchronizationConstraint inputSynchronizationConstraint = (InputSynchronizationConstraint)theEObject;
+			T result = caseInputSynchronizationConstraint(inputSynchronizationConstraint);
+			if(result == null)
+				result = caseAgeTimingConstraint(inputSynchronizationConstraint);
+			if(result == null)
+				result = caseDelayConstraint(inputSynchronizationConstraint);
+			if(result == null)
+				result = caseTimingConstraint(inputSynchronizationConstraint);
+			if(result == null)
+				result = caseEAElement(inputSynchronizationConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.OUTPUT_SYNCHRONIZATION_CONSTRAINT:
+		{
+			OutputSynchronizationConstraint outputSynchronizationConstraint = (OutputSynchronizationConstraint)theEObject;
+			T result = caseOutputSynchronizationConstraint(outputSynchronizationConstraint);
+			if(result == null)
+				result = caseReactionConstraint(outputSynchronizationConstraint);
+			if(result == null)
+				result = caseDelayConstraint(outputSynchronizationConstraint);
+			if(result == null)
+				result = caseTimingConstraint(outputSynchronizationConstraint);
+			if(result == null)
+				result = caseEAElement(outputSynchronizationConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.REACTION_CONSTRAINT:
+		{
+			ReactionConstraint reactionConstraint = (ReactionConstraint)theEObject;
+			T result = caseReactionConstraint(reactionConstraint);
+			if(result == null)
+				result = caseDelayConstraint(reactionConstraint);
+			if(result == null)
+				result = caseTimingConstraint(reactionConstraint);
+			if(result == null)
+				result = caseEAElement(reactionConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.SPORADIC_EVENT_CONSTRAINT:
+		{
+			SporadicEventConstraint sporadicEventConstraint = (SporadicEventConstraint)theEObject;
+			T result = caseSporadicEventConstraint(sporadicEventConstraint);
+			if(result == null)
+				result = caseEventConstraint(sporadicEventConstraint);
+			if(result == null)
+				result = caseTimingConstraint(sporadicEventConstraint);
+			if(result == null)
+				result = caseEAElement(sporadicEventConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.PERIODIC_EVENT_CONSTRAINT:
+		{
+			PeriodicEventConstraint periodicEventConstraint = (PeriodicEventConstraint)theEObject;
+			T result = casePeriodicEventConstraint(periodicEventConstraint);
+			if(result == null)
+				result = caseEventConstraint(periodicEventConstraint);
+			if(result == null)
+				result = caseTimingConstraint(periodicEventConstraint);
+			if(result == null)
+				result = caseEAElement(periodicEventConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.PATTERN_EVENT_CONSTRAINT:
+		{
+			PatternEventConstraint patternEventConstraint = (PatternEventConstraint)theEObject;
+			T result = casePatternEventConstraint(patternEventConstraint);
+			if(result == null)
+				result = caseEventConstraint(patternEventConstraint);
+			if(result == null)
+				result = caseTimingConstraint(patternEventConstraint);
+			if(result == null)
+				result = caseEAElement(patternEventConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingconstraintsPackage.ARBITRARY_EVENT_CONSTRAINT:
+		{
+			ArbitraryEventConstraint arbitraryEventConstraint = (ArbitraryEventConstraint)theEObject;
+			T result = caseArbitraryEventConstraint(arbitraryEventConstraint);
+			if(result == null)
+				result = caseEventConstraint(arbitraryEventConstraint);
+			if(result == null)
+				result = caseTimingConstraint(arbitraryEventConstraint);
+			if(result == null)
+				result = caseEAElement(arbitraryEventConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsXMLProcessor.java
index cce087363a3..c29dd4c4f38 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/timingconstraints/util/TimingconstraintsXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.timing.timingconstraints.TimingconstraintsPac
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingconstraintsXMLProcessor extends XMLProcessor {
@@ -35,22 +36,24 @@ public class TimingconstraintsXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingconstraintsXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		TimingconstraintsPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the TimingconstraintsResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new TimingconstraintsResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new TimingconstraintsResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingAdapterFactory.java
index 169cb7b1b68..dd5170cc47b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.timing.*;
 import org.eclipse.papyrus.eastadl.timing.Event;
 import org.eclipse.papyrus.eastadl.timing.EventChain;
 import org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint;
@@ -33,8 +34,9 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
 
 
 /**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage
  * @generated
  */
@@ -43,6 +45,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static TimingPackage modelPackage;
@@ -51,62 +54,75 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TimingSwitch<Adapter> modelSwitch = new TimingSwitch<Adapter>() {
-			@Override
-			public Adapter caseTimingDescription(TimingDescription object) {
-				return createTimingDescriptionAdapter();
-			}
-			@Override
-			public Adapter caseTimingConstraint(TimingConstraint object) {
-				return createTimingConstraintAdapter();
-			}
-			@Override
-			public Adapter caseTimeDuration(TimeDuration object) {
-				return createTimeDurationAdapter();
-			}
-			@Override
-			public Adapter caseTiming(Timing object) {
-				return createTimingAdapter();
-			}
-			@Override
-			public Adapter caseEventChain(EventChain object) {
-				return createEventChainAdapter();
-			}
-			@Override
-			public Adapter caseEvent(Event object) {
-				return createEventAdapter();
-			}
-			@Override
-			public Adapter caseExecutionTimeConstraint(ExecutionTimeConstraint object) {
-				return createExecutionTimeConstraintAdapter();
-			}
-			@Override
-			public Adapter casePrecedenceConstraint(PrecedenceConstraint object) {
-				return createPrecedenceConstraintAdapter();
-			}
-			@Override
-			public Adapter caseEAElement(EAElement object) {
-				return createEAElementAdapter();
-			}
-			@Override
-			public Adapter caseContext(Context object) {
-				return createContextAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter caseTimingDescription(TimingDescription object) {
+			return createTimingDescriptionAdapter();
+		}
+
+		@Override
+		public Adapter caseTimingConstraint(TimingConstraint object) {
+			return createTimingConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseTimeDuration(TimeDuration object) {
+			return createTimeDurationAdapter();
+		}
+
+		@Override
+		public Adapter caseTiming(Timing object) {
+			return createTimingAdapter();
+		}
+
+		@Override
+		public Adapter caseEventChain(EventChain object) {
+			return createEventChainAdapter();
+		}
+
+		@Override
+		public Adapter caseEvent(Event object) {
+			return createEventAdapter();
+		}
+
+		@Override
+		public Adapter caseExecutionTimeConstraint(ExecutionTimeConstraint object) {
+			return createExecutionTimeConstraintAdapter();
+		}
+
+		@Override
+		public Adapter casePrecedenceConstraint(PrecedenceConstraint object) {
+			return createPrecedenceConstraintAdapter();
+		}
+
+		@Override
+		public Adapter caseEAElement(EAElement object) {
+			return createEAElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContext(Context object) {
+			return createContextAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = TimingPackage.eINSTANCE;
 		}
 	}
@@ -114,7 +130,9 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -129,6 +147,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context
 	 * @generated
@@ -141,6 +160,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This default
 	 * implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -153,6 +173,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc
 	 * --> This default implementation returns null so that we can easily ignore cases; it's useful
 	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.Event
 	 * @generated
@@ -162,8 +183,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.eastadl.timing.EventChain <em>Event Chain</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.eastadl.timing.EventChain <em>Event Chain</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
@@ -177,11 +197,13 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint <em>Execution Time Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint
+	 * <em>Execution Time Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint
 	 * @generated
@@ -196,6 +218,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.PrecedenceConstraint
 	 * @generated
@@ -210,6 +233,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement
 	 * @generated
@@ -224,6 +248,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimeDuration
 	 * @generated
@@ -233,8 +258,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.eastadl.timing.Timing <em>Timing</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.eastadl.timing.Timing <em>Timing</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
@@ -252,6 +276,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingConstraint
 	 * @generated
@@ -265,6 +290,7 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.eastadl.timing.TimingDescription
 	 * @generated
@@ -278,15 +304,16 @@ public class TimingAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc
 	 * --> This implementation returns <code>true</code> if the object is either the model's package
 	 * or is an instance object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceFactoryImpl.java
index 2ff8b66e538..33fc07c9b17 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**
  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--
  * end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.util.TimingResourceImpl
  * @generated
  */
@@ -31,6 +32,7 @@ public class TimingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingResourceFactoryImpl() {
@@ -40,6 +42,7 @@ public class TimingResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceImpl.java
index 2d833efb543..81c162b4789 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.util.TimingResourceFactoryImpl
  * @generated
  */
@@ -28,7 +29,9 @@ public class TimingResourceImpl extends XMLResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public TimingResourceImpl(URI uri) {
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingSwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingSwitch.java
index 61490af3267..9175ad072eb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingSwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
+import org.eclipse.papyrus.eastadl.timing.*;
 import org.eclipse.papyrus.eastadl.timing.Event;
 import org.eclipse.papyrus.eastadl.timing.EventChain;
 import org.eclipse.papyrus.eastadl.timing.ExecutionTimeConstraint;
@@ -37,6 +38,7 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * each class of the model, starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.eastadl.timing.TimingPackage
  * @generated
  */
@@ -45,6 +47,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static TimingPackage modelPackage;
@@ -52,10 +55,11 @@ public class TimingSwitch<T> extends Switch<T> {
 	/**
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = TimingPackage.eINSTANCE;
 		}
 	}
@@ -64,6 +68,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -79,7 +84,9 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -94,7 +101,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -109,7 +116,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Event Chain</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -124,7 +131,9 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Execution Time Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -139,7 +148,9 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Precedence Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -154,7 +165,9 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -169,7 +182,9 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Time Duration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -184,7 +199,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Timing</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -199,7 +214,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -214,7 +229,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Description</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -229,7 +244,7 @@ public class TimingSwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -242,74 +257,105 @@ public class TimingSwitch<T> extends Switch<T> {
 	/**
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TimingPackage.TIMING_DESCRIPTION: {
-				TimingDescription timingDescription = (TimingDescription)theEObject;
-				T result = caseTimingDescription(timingDescription);
-				if (result == null) result = caseEAElement(timingDescription);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.TIMING_CONSTRAINT: {
-				TimingConstraint timingConstraint = (TimingConstraint)theEObject;
-				T result = caseTimingConstraint(timingConstraint);
-				if (result == null) result = caseEAElement(timingConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.TIME_DURATION: {
-				TimeDuration timeDuration = (TimeDuration)theEObject;
-				T result = caseTimeDuration(timeDuration);
-				if (result == null) result = caseEAElement(timeDuration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.TIMING: {
-				Timing timing = (Timing)theEObject;
-				T result = caseTiming(timing);
-				if (result == null) result = caseContext(timing);
-				if (result == null) result = caseEAElement(timing);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.EVENT_CHAIN: {
-				EventChain eventChain = (EventChain)theEObject;
-				T result = caseEventChain(eventChain);
-				if (result == null) result = caseTimingDescription(eventChain);
-				if (result == null) result = caseEAElement(eventChain);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.EVENT: {
-				Event event = (Event)theEObject;
-				T result = caseEvent(event);
-				if (result == null) result = caseTimingDescription(event);
-				if (result == null) result = caseEAElement(event);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.EXECUTION_TIME_CONSTRAINT: {
-				ExecutionTimeConstraint executionTimeConstraint = (ExecutionTimeConstraint)theEObject;
-				T result = caseExecutionTimeConstraint(executionTimeConstraint);
-				if (result == null) result = caseTimingConstraint(executionTimeConstraint);
-				if (result == null) result = caseEAElement(executionTimeConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TimingPackage.PRECEDENCE_CONSTRAINT: {
-				PrecedenceConstraint precedenceConstraint = (PrecedenceConstraint)theEObject;
-				T result = casePrecedenceConstraint(precedenceConstraint);
-				if (result == null) result = caseTimingConstraint(precedenceConstraint);
-				if (result == null) result = caseEAElement(precedenceConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case TimingPackage.TIMING_DESCRIPTION:
+		{
+			TimingDescription timingDescription = (TimingDescription)theEObject;
+			T result = caseTimingDescription(timingDescription);
+			if(result == null)
+				result = caseEAElement(timingDescription);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.TIMING_CONSTRAINT:
+		{
+			TimingConstraint timingConstraint = (TimingConstraint)theEObject;
+			T result = caseTimingConstraint(timingConstraint);
+			if(result == null)
+				result = caseEAElement(timingConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.TIME_DURATION:
+		{
+			TimeDuration timeDuration = (TimeDuration)theEObject;
+			T result = caseTimeDuration(timeDuration);
+			if(result == null)
+				result = caseEAElement(timeDuration);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.TIMING:
+		{
+			Timing timing = (Timing)theEObject;
+			T result = caseTiming(timing);
+			if(result == null)
+				result = caseContext(timing);
+			if(result == null)
+				result = caseEAElement(timing);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.EVENT_CHAIN:
+		{
+			EventChain eventChain = (EventChain)theEObject;
+			T result = caseEventChain(eventChain);
+			if(result == null)
+				result = caseTimingDescription(eventChain);
+			if(result == null)
+				result = caseEAElement(eventChain);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.EVENT:
+		{
+			Event event = (Event)theEObject;
+			T result = caseEvent(event);
+			if(result == null)
+				result = caseTimingDescription(event);
+			if(result == null)
+				result = caseEAElement(event);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.EXECUTION_TIME_CONSTRAINT:
+		{
+			ExecutionTimeConstraint executionTimeConstraint = (ExecutionTimeConstraint)theEObject;
+			T result = caseExecutionTimeConstraint(executionTimeConstraint);
+			if(result == null)
+				result = caseTimingConstraint(executionTimeConstraint);
+			if(result == null)
+				result = caseEAElement(executionTimeConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TimingPackage.PRECEDENCE_CONSTRAINT:
+		{
+			PrecedenceConstraint precedenceConstraint = (PrecedenceConstraint)theEObject;
+			T result = casePrecedenceConstraint(precedenceConstraint);
+			if(result == null)
+				result = caseTimingConstraint(precedenceConstraint);
+			if(result == null)
+				result = caseEAElement(precedenceConstraint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingXMLProcessor.java
index 2afe8d0a0eb..9d9de55ee95 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/timing/util/TimingXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.timing.TimingPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TimingXMLProcessor extends XMLProcessor {
@@ -34,6 +35,7 @@ public class TimingXMLProcessor extends XMLProcessor {
 	/**
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TimingXMLProcessor() {
@@ -49,7 +51,7 @@ public class TimingXMLProcessor extends XMLProcessor {
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new TimingResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new TimingResourceFactoryImpl());
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceFactoryImpl.java
index 7c85583d490..4c46efa6686 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceFactoryImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.util.EastadlResourceImpl

  * @generated

  */

@@ -30,6 +31,7 @@ public class EastadlResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EastadlResourceFactoryImpl() {

@@ -39,6 +41,7 @@ public class EastadlResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceImpl.java
index 1ec2b80a464..9412ac56f14 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.util.EastadlResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class EastadlResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public EastadlResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlXMLProcessor.java
index 5f346eab0eb..5c7d2d940be 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/util/EastadlXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.EastadlPackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class EastadlXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class EastadlXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EastadlXMLProcessor() {

@@ -49,7 +51,7 @@ public class EastadlXMLProcessor extends XMLProcessor {
 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new EastadlResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new EastadlResourceFactoryImpl());

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurableContainer.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurableContainer.java
index 1933c8369f6..7452ba00692 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurableContainer.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurableContainer.java
@@ -25,15 +25,32 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Configurable Container</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ConfigurableContainer is a marker class that marks an element identified by association configurableElement as a configurable container of some variable content, i.e. VariableElements and other, lower-level ConfigurableContainers. In order to describe the contained variability to the outside world and to allow configuration of it, the ConfigurableContainer can have a public feature model and an internal configuration decision model not visible from the outside, called "internal binding".
+ * ConfigurableContainer is a marker class that marks an element identified by association configurableElement as a configurable container of some
+ * variable content, i.e. VariableElements and other, lower-level ConfigurableContainers. In order to describe the contained variability to the
+ * outside world and to allow configuration of it, the ConfigurableContainer can have a public feature model and an internal configuration decision
+ * model not visible from the outside, called "internal binding".
  * 
- * In addition, the ConfigurableContainer can be used to extend the EAST-ADL2 variability approach to other languages and standards by pointing from the ConfigurableContainer to the respective (non EAST-ADL2) element with association configurableElement. This provides the public feature model and the ConfigurationDecisionModel to that non EAST-ADL2 element.
+ * In addition, the ConfigurableContainer can be used to extend the EAST-ADL2 variability approach to other languages and standards by pointing from
+ * the ConfigurableContainer to the respective (non EAST-ADL2) element with association configurableElement. This provides the public feature model
+ * and the ConfigurationDecisionModel to that non EAST-ADL2 element.
  * 
- * The variable content of a ConfigurableContainer is defined as all VariableElements and all other ConfigurableContainers that are directly or indirectly contained in the Identifiable denoted by association configurableElement. Instead of 'variable content' the term 'internal variability' may be used.
+ * The variable content of a ConfigurableContainer is defined as all VariableElements and all other ConfigurableContainers that are directly or
+ * indirectly contained in the Identifiable denoted by association configurableElement. Instead of 'variable content' the term 'internal variability'
+ * may be used.
  * 
- * Note that, according to this rule, the containment between a ConfigurableContainer and its variable content, i.e. its contained VariableElements and lower-level ConfigurableContainers, is not(!) directly defined between these meta-classes. Instead, the containment is defined by the Identifiable pointed to by association configurableElement. For example, consider a FunctionType "WiperSystem" containing two FunctionPrototypes "front" and "rear" both typed by FunctionType "WiperMotor"; to make the wiper system configurable and the rear wiper motor optional, a ConfigurableContainer is created that points to FunctionType "WiperSystem" (with association configurableElement) and a VariableElement is created that points to FunctionPrototype "rear" (with association optionalElement); the containment between the ConfigurableContainer and the VariableElement is therefore not explicitly defined between these classes but instead only between FunctionType "WiperSystem" and "FunctionPrototype" rear. In addition, the variability-related visibility of "rear" can be changed with PrivateContent: by default the variability of "rear" will be public and visible for direct configuration from the outside of its containing ConfigurableContainer, i.e. "WiperSystem"; by defining a PrivateContent marker object pointing to the FunctionPrototype "rear" this can be changed to private and this variability will not be visible from the outside of "WiperSystem".
+ * Note that, according to this rule, the containment between a ConfigurableContainer and its variable content, i.e. its contained VariableElements
+ * and lower-level ConfigurableContainers, is not(!) directly defined between these meta-classes. Instead, the containment is defined by the
+ * Identifiable pointed to by association configurableElement. For example, consider a FunctionType "WiperSystem" containing two FunctionPrototypes
+ * "front" and "rear" both typed by FunctionType "WiperMotor"; to make the wiper system configurable and the rear wiper motor optional, a
+ * ConfigurableContainer is created that points to FunctionType "WiperSystem" (with association configurableElement) and a VariableElement is created
+ * that points to FunctionPrototype "rear" (with association optionalElement); the containment between the ConfigurableContainer and the
+ * VariableElement is therefore not explicitly defined between these classes but instead only between FunctionType "WiperSystem" and
+ * "FunctionPrototype" rear. In addition, the variability-related visibility of "rear" can be changed with PrivateContent: by default the variability
+ * of "rear" will be public and visible for direct configuration from the outside of its containing ConfigurableContainer, i.e. "WiperSystem"; by
+ * defining a PrivateContent marker object pointing to the FunctionPrototype "rear" this can be changed to private and this variability will not be
+ * visible from the outside of "WiperSystem".
  * 
  * Constraints:
  * [1] Identifies one FunctionType or one HardwareComponentType.
@@ -41,37 +58,40 @@ import org.eclipse.uml2.uml.NamedElement;
  * [2] The publicFeatureModel is only allowed to contain Features (no VehicleFeatures).
  * 
  * Semantics:
- * Marks the element identified by association configurableElement as a configurable container of variable content (i.e. it contains VariableElements and/or other, lower-level ConfigurableContainers) and optionally provides a public feature model and an internal configuration decision model for it, thus providing configurability support for them.
+ * Marks the element identified by association configurableElement as a configurable container of variable content (i.e. it contains VariableElements
+ * and/or other, lower-level ConfigurableContainers) and optionally provides a public feature model and an internal configuration decision model for
+ * it, thus providing configurability support for them.
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding <em>Internal Binding</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getVariationGroup <em>Variation Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement <em>Configurable Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel <em>Public Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding <em>Internal Binding</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getVariationGroup <em>Variation Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement <em>Configurable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel <em>Public Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer()
  * @model
  * @generated
  */
 public interface ConfigurableContainer extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Configurable Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Configurable Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Configurable Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Configurable Element</em>' reference.
 	 * @see #setConfigurableElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_ConfigurableElement()
@@ -87,6 +107,7 @@ public interface ConfigurableContainer extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The PDM of the configurable container.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Internal Binding</em>' reference.
 	 * @see #setInternalBinding(InternalBinding)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_InternalBinding()
@@ -102,6 +123,7 @@ public interface ConfigurableContainer extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The local feature model of the configurable container.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Public Feature Model</em>' reference.
 	 * @see #setPublicFeatureModel(FeatureModel)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_PublicFeatureModel()
@@ -118,6 +140,7 @@ public interface ConfigurableContainer extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * The variation groups that define certain constraints between this ADLVariableContainer's variable elements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Variation Group</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_VariationGroup()
 	 * @model ordered="false"
@@ -129,10 +152,10 @@ public interface ConfigurableContainer extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_Base_Class()
@@ -145,7 +168,9 @@ public interface ConfigurableContainer extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -155,10 +180,10 @@ public interface ConfigurableContainer extends EAElement {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurableContainer_Base_Package()
@@ -171,37 +196,48 @@ public interface ConfigurableContainer extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
 	void setBase_Package(org.eclipse.uml2.uml.Package value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement <em>Configurable Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement
+	 * <em>Configurable Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Configurable Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Configurable Element</em>' reference.
 	 * @see #getConfigurableElement()
 	 * @generated
 	 */
 	void setConfigurableElement(NamedElement value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding <em>Internal Binding</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding <em>Internal Binding</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Internal Binding</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Internal Binding</em>' reference.
 	 * @see #getInternalBinding()
 	 * @generated
 	 */
 	void setInternalBinding(InternalBinding value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel <em>Public Feature Model</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel
+	 * <em>Public Feature Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Public Feature Model</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Public Feature Model</em>' reference.
 	 * @see #getPublicFeatureModel()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecision.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecision.java
index 0fbc2632c66..4da6ad71c39 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecision.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecision.java
@@ -22,40 +22,55 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Configuration Decision</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ConfigurationDecision represents a single, atomized rule on how to configure the target feature model(s) of the containing ConfigurationDecisionModel, depending on a given configuration of the source feature model(s). Two examples are: "all North American (USA+Canada) cars except A-Class have cruise control" (one ConfigurationDecision) or "all Canadian cars have adaptive cruise control" (another ConfigurationDecision). All ConfigurationDecisions within a single ConfigurationDecisionModel then specify how the target feature model(s) are to be configured depending on the configuration of the source feature model(s).
+ * ConfigurationDecision represents a single, atomized rule on how to configure the target feature model(s) of the containing
+ * ConfigurationDecisionModel, depending on a given configuration of the source feature model(s). Two examples are:
+ * "all North American (USA+Canada) cars except A-Class have cruise control" (one ConfigurationDecision) or
+ * "all Canadian cars have adaptive cruise control" (another ConfigurationDecision). All ConfigurationDecisions within a single
+ * ConfigurationDecisionModel then specify how the target feature model(s) are to be configured depending on the configuration of the source feature
+ * model(s).
  * 
- * Example: Lets assume we have two FeatureModels: FM1 and FM2. FM1 has possible end-customer decisions like USA, Canada, EU, Japan and A-Class, C-Class, etc. FM2 has another possible end-customer decision such as CruiseControl, AdaptiveCruiseControl, RearWiper, RainSensor. End-customer decisions in FM2 describe possible technical features of the delivered products. By way of a set of ConfigurationDecisions it is now possible to define the configuration of FM2 (i.e. if there is a RainSensor, etc.) in dependency of a configuration of FM1. In other words, with a ConfigurationDecision we can express something like: "If USA is selected in FM1 AND A-Class is not selected in FM1, then CruiseControl will be selected in FM2".
+ * Example: Lets assume we have two FeatureModels: FM1 and FM2. FM1 has possible end-customer decisions like USA, Canada, EU, Japan and A-Class,
+ * C-Class, etc. FM2 has another possible end-customer decision such as CruiseControl, AdaptiveCruiseControl, RearWiper, RainSensor. End-customer
+ * decisions in FM2 describe possible technical features of the delivered products. By way of a set of ConfigurationDecisions it is now possible to
+ * define the configuration of FM2 (i.e. if there is a RainSensor, etc.) in dependency of a configuration of FM1. In other words, with a
+ * ConfigurationDecision we can express something like:
+ * "If USA is selected in FM1 AND A-Class is not selected in FM1, then CruiseControl will be selected in FM2".
  * 
- * The two most important constituents of a ConfigurationDecision are its 'criterion' and 'effect'. The effect is a list of things to select and deselect in the target(!) configuration(s), whereas the criterion formulates a condition on the source(!) configuration(s) under which this ConfigurationDecision's effect will actually be applied to the target configuration(s). In the first example above, the criterion would be "USA & not A-Class" and the effect would be "CruiseControl[+]".
+ * The two most important constituents of a ConfigurationDecision are its 'criterion' and 'effect'. The effect is a list of things to select and
+ * deselect in the target(!) configuration(s), whereas the criterion formulates a condition on the source(!) configuration(s) under which this
+ * ConfigurationDecision's effect will actually be applied to the target configuration(s). In the first example above, the criterion would be
+ * "USA & not A-Class" and the effect would be "CruiseControl[+]".
  * 
  * 
  * Semantics:
  * The ConfigurationDecision excludes or includes Features based on a given criterion.
  * 
- * The elements of the criterion and effect attributes may be identified through the target and the source in the selectionCriterion. The criterion and effect attributes can contain a VSL expression with qualified names of the identified elements. 
+ * The elements of the criterion and effect attributes may be identified through the target and the source in the selectionCriterion. The criterion
+ * and effect attributes can contain a VSL expression with qualified names of the identified elements.
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getEffect <em>Effect</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion <em>Criterion</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence <em>Is Equivalence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion <em>Selection Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getEffect <em>Effect</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion <em>Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence <em>Is Equivalence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion <em>Selection Criterion</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision()
  * @model
  * @generated
  */
 public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
+
 	/**
 	 * Returns the value of the '<em><b>Criterion</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -63,6 +78,7 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * <!-- begin-model-doc -->
 	 * The inclusionCriterion gives the criterion to select the respective products (e.g. Northern American cars).
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Criterion</em>' attribute.
 	 * @see #setCriterion(String)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision_Criterion()
@@ -76,8 +92,10 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The rationale gives the reason for the specified product decision, especially for the inclusion criterion and the selection of included and excluded features.
+	 * The rationale gives the reason for the specified product decision, especially for the inclusion criterion and the selection of included and
+	 * excluded features.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Effect</em>' attribute.
 	 * @see #setEffect(String)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision_Effect()
@@ -90,10 +108,11 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * Returns the value of the '<em><b>Selection Criterion</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Selection Criterion</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Selection Criterion</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Selection Criterion</em>' reference.
 	 * @see #setSelectionCriterion(SelectionCriterion)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision_SelectionCriterion()
@@ -107,10 +126,10 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision_Target()
 	 * @model
@@ -125,6 +144,7 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * <!-- begin-model-doc -->
 	 * Means that the included and excluded features are selected if and only if the specified inclusion criterion holds.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Is Equivalence</em>' attribute.
 	 * @see #setIsEquivalence(boolean)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecision_IsEquivalence()
@@ -137,7 +157,9 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion <em>Criterion</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Criterion</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Criterion</em>' attribute.
 	 * @see #getCriterion()
 	 * @generated
 	 */
@@ -147,27 +169,35 @@ public interface ConfigurationDecision extends ConfigurationDecisionModelEntry {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getEffect <em>Effect</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Effect</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Effect</em>' attribute.
 	 * @see #getEffect()
 	 * @generated
 	 */
 	void setEffect(String value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence <em>Is Equivalence</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence <em>Is Equivalence</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Equivalence</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Equivalence</em>' attribute.
 	 * @see #isIsEquivalence()
 	 * @generated
 	 */
 	void setIsEquivalence(boolean value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion <em>Selection Criterion</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion <em>Selection Criterion</em>}
+	 * ' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Selection Criterion</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Selection Criterion</em>' reference.
 	 * @see #getSelectionCriterion()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionFolder.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionFolder.java
index 140296d9b00..42be5c639ed 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionFolder.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionFolder.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Configuration Decision Folder</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * ConfigurationDecisionFolder represents a grouping for ConfigurationDecisions.
  * 
@@ -32,28 +32,29 @@ import org.eclipse.emf.common.util.EList;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder#getChildEntry <em>Child Entry</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder#getChildEntry <em>Child Entry</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionFolder()
  * @model
  * @generated
  */
 public interface ConfigurationDecisionFolder extends ConfigurationDecisionModelEntry {
+
 	/**
 	 * Returns the value of the '<em><b>Child Entry</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Child Entry</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Child Entry</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Child Entry</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionFolder_ChildEntry()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModel.java
index d5b1d2b928f..474f112a493 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModel.java
@@ -23,43 +23,53 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Configuration Decision Model</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * A ConfigurationDecisionModel defines how to configure m so-called target feature models, depending on a given configuration of n so-called source feature models, thus establishing a configuration-related link from the n source feature models to the m target feature models (also called configuration link). With the information captured in a ConfigurationDecisionModel it is then possible to transform a given set of source configurations (one for every source feature model) into corresponding target configurations (one for every target feature model).
+ * A ConfigurationDecisionModel defines how to configure m so-called target feature models, depending on a given configuration of n so-called source
+ * feature models, thus establishing a configuration-related link from the n source feature models to the m target feature models (also called
+ * configuration link). With the information captured in a ConfigurationDecisionModel it is then possible to transform a given set of source
+ * configurations (one for every source feature model) into corresponding target configurations (one for every target feature model).
  * 
- * For example, a ConfigurationDecisionModel can capture information such as "if feature 'S-Class' is selected in the source feature model, then select feature 'RainSensor' in the target feature model" or "if feature 'USA' is selected in the source feature model, then select feature 'CupHolder' in the target feature model".
+ * For example, a ConfigurationDecisionModel can capture information such as
+ * "if feature 'S-Class' is selected in the source feature model, then select feature 'RainSensor' in the target feature model" or
+ * "if feature 'USA' is selected in the source feature model, then select feature 'CupHolder' in the target feature model".
  * 
- * Note that in principle all ConfigurationDecisionModels have source / target feature models. However, only for those used on vehicle level they are defined explicitly; for ConfigurationDecisionModels used as an internal binding on FunctionTypes the source and target feature models are defined implicitly (cf. metaclass InternalBinding). In addition, in the special case of FeatureConfiguration there is by definition no source and only a single target feature model, which is defined explicitly (cf. metaclass FeatureConfiguration).
+ * Note that in principle all ConfigurationDecisionModels have source / target feature models. However, only for those used on vehicle level they are
+ * defined explicitly; for ConfigurationDecisionModels used as an internal binding on FunctionTypes the source and target feature models are defined
+ * implicitly (cf. metaclass InternalBinding). In addition, in the special case of FeatureConfiguration there is by definition no source and only a
+ * single target feature model, which is defined explicitly (cf. metaclass FeatureConfiguration).
  * 
- * The configuration information captured in a ConfigurationDecisionModel is represented by ConfigurationDecisions, each of which captures a single, atomized rule on how to configure the target feature model(s) depending on a given configuration of the source feature model(s).
+ * The configuration information captured in a ConfigurationDecisionModel is represented by ConfigurationDecisions, each of which captures a single,
+ * atomized rule on how to configure the target feature model(s) depending on a given configuration of the source feature model(s).
  * 
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getRootEntry <em>Root Entry</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getRootEntry <em>Root Entry</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModel()
  * @model abstract="true"
  * @generated
  */
 public interface ConfigurationDecisionModel extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModel_Base_Package()
@@ -69,10 +79,13 @@ public interface ConfigurationDecisionModel extends EAElement {
 	org.eclipse.uml2.uml.Package getBase_Package();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package <em>Base Package</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package <em>Base Package</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -82,10 +95,10 @@ public interface ConfigurationDecisionModel extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModel_Base_Class()
@@ -98,7 +111,9 @@ public interface ConfigurationDecisionModel extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -109,10 +124,10 @@ public interface ConfigurationDecisionModel extends EAElement {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Root Entry</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Root Entry</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Root Entry</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModel_RootEntry()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModelEntry.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModelEntry.java
index 5f61031f4a7..82eb3fcffee 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModelEntry.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ConfigurationDecisionModelEntry.java
@@ -21,27 +21,28 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Configuration Decision Model Entry</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * ConfigurationDecisionModelEntry is the abstract base class for all content of a ConfigurationDecisionModel.
  * 
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive <em>Is Active</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive <em>Is Active</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModelEntry()
  * @model abstract="true"
  * @generated
  */
 public interface ConfigurationDecisionModelEntry extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Is Active</b></em>' attribute.
 	 * The default value is <code>"true"</code>.
@@ -50,6 +51,7 @@ public interface ConfigurationDecisionModelEntry extends EAElement {
 	 * <!-- begin-model-doc -->
 	 * If active==TRUE then the entry is selected for the ProductDecisionModel.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Is Active</em>' attribute.
 	 * @see #setIsActive(boolean)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModelEntry_IsActive()
@@ -59,10 +61,13 @@ public interface ConfigurationDecisionModelEntry extends EAElement {
 	boolean isIsActive();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive <em>Is Active</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive <em>Is Active</em>}'
+	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Active</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Active</em>' attribute.
 	 * @see #isIsActive()
 	 * @generated
 	 */
@@ -72,10 +77,10 @@ public interface ConfigurationDecisionModelEntry extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getConfigurationDecisionModelEntry_Base_Class()
@@ -85,10 +90,13 @@ public interface ConfigurationDecisionModelEntry extends EAElement {
 	org.eclipse.uml2.uml.Class getBase_Class();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class <em>Base Class</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class <em>Base Class</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ContainerConfiguration.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ContainerConfiguration.java
index dabd5ccf255..6105f950a17 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ContainerConfiguration.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ContainerConfiguration.java
@@ -20,13 +20,18 @@ package org.eclipse.papyrus.eastadl.variability;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Container Configuration</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * ContainerConfiguration defines an actual configuration of the variable content of a ConfigurableContainer, in particular the selection or deselection of contained VariableElements and the configuration of the public feature models of contained other ConfigurableContainers. For more details on the variable content of a ConfigurableContainer refer to the documentation of meta-class ConfigurableContainer.
+ * ContainerConfiguration defines an actual configuration of the variable content of a ConfigurableContainer, in particular the selection or
+ * deselection of contained VariableElements and the configuration of the public feature models of contained other ConfigurableContainers. For more
+ * details on the variable content of a ConfigurableContainer refer to the documentation of meta-class ConfigurableContainer.
  * 
- * The ContainerConfiguration inherits from ConfigurationDecisionModel even though it does not define a configuration link between feature models, similar as FeatureConfiguration. For more information on this refer to the documentation of meta-class FeatureConfiguration.
+ * The ContainerConfiguration inherits from ConfigurationDecisionModel even though it does not define a configuration link between feature models,
+ * similar as FeatureConfiguration. For more information on this refer to the documentation of meta-class FeatureConfiguration.
  * 
- * The source and target feature models of a ContainerConfiguration are defined implicitly: it always has zero source feature models (as explained for FeatureConfiguration) and its target feature models can be deduced from the ConfigurableContainer being configured by applying the same rules as defined for InternalBinding.
+ * The source and target feature models of a ContainerConfiguration are defined implicitly: it always has zero source feature models (as explained for
+ * FeatureConfiguration) and its target feature models can be deduced from the ConfigurableContainer being configured by applying the same rules as
+ * defined for InternalBinding.
  * 
  * Semantics:
  * The ContainerConfiguration specifies a concrete configuration of the variable content of a ConfigurableContainer.
@@ -34,27 +39,28 @@ package org.eclipse.papyrus.eastadl.variability;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer <em>Configured Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer <em>Configured Container</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getContainerConfiguration()
  * @model
  * @generated
  */
 public interface ContainerConfiguration extends ConfigurationDecisionModel {
+
 	/**
 	 * Returns the value of the '<em><b>Configured Container</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Configured Container</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Configured Container</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Configured Container</em>' reference.
 	 * @see #setConfiguredContainer(ConfigurableContainer)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getContainerConfiguration_ConfiguredContainer()
@@ -64,10 +70,13 @@ public interface ContainerConfiguration extends ConfigurationDecisionModel {
 	ConfigurableContainer getConfiguredContainer();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer <em>Configured Container</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer
+	 * <em>Configured Container</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Configured Container</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Configured Container</em>' reference.
 	 * @see #getConfiguredContainer()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/FeatureConfiguration.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/FeatureConfiguration.java
index 73d30d9de20..77bac1313ab 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/FeatureConfiguration.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/FeatureConfiguration.java
@@ -21,15 +21,24 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Feature Configuration</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * FeatureConfiguration defines an actual configuration of a FeatureModel, in particular the selection or deselection of optional features, values for selected parameterized features, and instance creations for cloned features.
+ * FeatureConfiguration defines an actual configuration of a FeatureModel, in particular the selection or deselection of optional features, values for
+ * selected parameterized features, and instance creations for cloned features.
  * 
- * Note that configurations of feature models are realized as a specialization of metaclass ConfigurationDecisionModel. This is possible because a ConfigurationDecisionModel also captures configuration, i.e. of its target feature model(s) ; while in the standard case of ConfigurationDecisionModel this target-side configuration depends on a given configuration of source feature model(s), we here simply define a "constant" target-side configuration without considering any source configurations. Therefore, the FeatureConfiguration meta-class has additional constraints compared to the super-class ConfigurationDecisionModel: the FeatureConfiguration has no source FeatureModel and only a single target FeatureModel, which serves as the FeatureModel being configured, explicitly defined through association 'configuredFeatureModel'. And since there are no source feature model to which the criterion can refer, all ConfigurationDecisions in a FeatureConfiguration must have "true" as their criterion.
+ * Note that configurations of feature models are realized as a specialization of metaclass ConfigurationDecisionModel. This is possible because a
+ * ConfigurationDecisionModel also captures configuration, i.e. of its target feature model(s) ; while in the standard case of
+ * ConfigurationDecisionModel this target-side configuration depends on a given configuration of source feature model(s), we here simply define a
+ * "constant" target-side configuration without considering any source configurations. Therefore, the FeatureConfiguration meta-class has additional
+ * constraints compared to the super-class ConfigurationDecisionModel: the FeatureConfiguration has no source FeatureModel and only a single target
+ * FeatureModel, which serves as the FeatureModel being configured, explicitly defined through association 'configuredFeatureModel'. And since there
+ * are no source feature model to which the criterion can refer, all ConfigurationDecisions in a FeatureConfiguration must have "true" as their
+ * criterion.
  * 
  * 
  * Semantics:
- * The FeatureConfiguration specifies a concrete configuration of a feature model, in particular which Features of this FeatureModel are selected or deselected.
+ * The FeatureConfiguration specifies a concrete configuration of a feature model, in particular which Features of this FeatureModel are selected or
+ * deselected.
  * 
  * Extension:
  * Class
@@ -37,27 +46,28 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * Constraint:
  * [1] Attribute criterion of all ConfigurationDecisions in a FeatureConfiguration must be set to "true".
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel <em>Configured Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel <em>Configured Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getFeatureConfiguration()
  * @model
  * @generated
  */
 public interface FeatureConfiguration extends ConfigurationDecisionModel {
+
 	/**
 	 * Returns the value of the '<em><b>Configured Feature Model</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Configured Feature Model</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Configured Feature Model</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Configured Feature Model</em>' reference.
 	 * @see #setConfiguredFeatureModel(FeatureModel)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getFeatureConfiguration_ConfiguredFeatureModel()
@@ -67,10 +77,13 @@ public interface FeatureConfiguration extends ConfigurationDecisionModel {
 	FeatureModel getConfiguredFeatureModel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel <em>Configured Feature Model</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel
+	 * <em>Configured Feature Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Configured Feature Model</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Configured Feature Model</em>' reference.
 	 * @see #getConfiguredFeatureModel()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/InternalBinding.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/InternalBinding.java
index 5659b2a65ad..dce88b86760 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/InternalBinding.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/InternalBinding.java
@@ -20,16 +20,22 @@ package org.eclipse.papyrus.eastadl.variability;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Internal Binding</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The InternalBinding is the private, internal ConfigurationDecisionModel of the ConfigurableContainer. It defines how the internal, lower-level variability of the ConfigurableContainer is bound, i.e. configured, depending on a given configuration of the ConfigurableContainer's public feature model. This way, the binding of this internal variability is encapsulated and hidden behind the public feature model, which serves as a variability-related interface.
+ * The InternalBinding is the private, internal ConfigurationDecisionModel of the ConfigurableContainer. It defines how the internal, lower-level
+ * variability of the ConfigurableContainer is bound, i.e. configured, depending on a given configuration of the ConfigurableContainer's public
+ * feature model. This way, the binding of this internal variability is encapsulated and hidden behind the public feature model, which serves as a
+ * variability-related interface.
  * 
- * Note that for this use case, the source and target feature models need not be defined explicitly because they are deduced implicitly: the ConfigurableContainer's public feature model serves as the (single) target feature model, and the source feature models are deduced from the ConfigurableContainer's internal variability (esp. other, lower-level ConfigurableContainers which are contained).
+ * Note that for this use case, the source and target feature models need not be defined explicitly because they are deduced implicitly: the
+ * ConfigurableContainer's public feature model serves as the (single) target feature model, and the source feature models are deduced from the
+ * ConfigurableContainer's internal variability (esp. other, lower-level ConfigurableContainers which are contained).
  * 
- * For a definition of the precise meaning of 'internal variability' in the above sense (also called variable content) refer to the documentation of meta-class ConfigurableContainer.
+ * For a definition of the precise meaning of 'internal variability' in the above sense (also called variable content) refer to the documentation of
+ * meta-class ConfigurableContainer.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getInternalBinding()
  * @model
  * @generated
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/PrivateContent.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/PrivateContent.java
index 5ec582ba6f3..7f31e92f691 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/PrivateContent.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/PrivateContent.java
@@ -23,14 +23,17 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Private Content</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * PrivateContent is a marker class that marks the artifact element denoted by association privateElement as private, i.e. it will not be presented to the outside of the containing ConfigurableContainer.
+ * PrivateContent is a marker class that marks the artifact element denoted by association privateElement as private, i.e. it will not be presented to
+ * the outside of the containing ConfigurableContainer.
  * 
- * Refer to the documentation of meta-class ConfigurableContainer for a detailed explanation of how ConfigurableContainer and PrivateContent play together.
+ * Refer to the documentation of meta-class ConfigurableContainer for a detailed explanation of how ConfigurableContainer and PrivateContent play
+ * together.
  * 
  * Constraint:
- * [1] Identifies either one FunctionPrototype or one FunctionPort or one FunctionConnector or one HardwareComponentPrototype or one HardwarePort or one ClampConnector.
+ * [1] Identifies either one FunctionPrototype or one FunctionPort or one FunctionConnector or one HardwareComponentPrototype or one HardwarePort or
+ * one ClampConnector.
  * 
  * Semantics:
  * Marks the element identified by association privateElement as private. Otherwise the elements visibility defaults to public.
@@ -38,28 +41,29 @@ import org.eclipse.uml2.uml.NamedElement;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement <em>Private Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement <em>Private Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getPrivateContent()
  * @model
  * @generated
  */
 public interface PrivateContent extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getPrivateContent_Base_Class()
@@ -72,7 +76,9 @@ public interface PrivateContent extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -82,10 +88,10 @@ public interface PrivateContent extends EAElement {
 	 * Returns the value of the '<em><b>Private Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Private Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Private Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Private Element</em>' reference.
 	 * @see #setPrivateElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getPrivateContent_PrivateElement()
@@ -98,7 +104,9 @@ public interface PrivateContent extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement <em>Private Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Private Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Private Element</em>' reference.
 	 * @see #getPrivateElement()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ReuseMetaInformation.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ReuseMetaInformation.java
index c48fb9cc43a..a5aca725b0c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ReuseMetaInformation.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/ReuseMetaInformation.java
@@ -18,11 +18,12 @@ package org.eclipse.papyrus.eastadl.variability;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification;

 

 /**

- * <!-- begin-user-doc --> A representation of the model object '

- * <em><b>Reuse Meta Information</b></em>'. <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Reuse Meta Information</b></em>'. <!-- end-user-doc -->

+ * 

  * <!-- begin-model-doc -->

- * ReuseMetaInformation represents the description information needed in the context of reuse. For example a specific entity is only a short-time solution that is not intended to be reused. Also a specific entity can only be reused for specific model ranges (that are not reflected in the product model). This kind of information can be stored in this information.

+ * ReuseMetaInformation represents the description information needed in the context of reuse. For example a specific entity is only a short-time

+ * solution that is not intended to be reused. Also a specific entity can only be reused for specific model ranges (that are not reflected in the

+ * product model). This kind of information can be stored in this information.

  * 

  * Semantics:

  * The ReuseMetaInformation represents information that explains if and how the respective entity can be reused.

@@ -30,16 +31,16 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecificatio
  * 

  * Extension: Class

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation <em>Information</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable <em>Is Reusable</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation <em>Information</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable <em>Is Reusable</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getReuseMetaInformation()

  * @model

  * @generated

@@ -49,8 +50,7 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	/**

 	 * Returns the value of the '<em><b>Information</b></em>' attribute. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Information</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Information</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The reuse information is stored in this

 	 * attribute. <!-- end-model-doc -->

@@ -64,11 +64,9 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	String getInformation();

 

 	/**

-	 * Returns the value of the '<em><b>Is Reusable</b></em>' attribute. The default value is

-	 * <code>"true"</code>. <!-- begin-user-doc -->

+	 * Returns the value of the '<em><b>Is Reusable</b></em>' attribute. The default value is <code>"true"</code>. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Is Reusable</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Is Reusable</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> This Boolean attributes just says if the

 	 * entity itself can essentially be reused or not. Specific information or constraints on reuse

@@ -85,7 +83,9 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation <em>Information</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Information</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Information</em>' attribute.

 	 * @see #getInformation()

 	 * @generated

 	 */

@@ -94,7 +94,9 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable <em>Is Reusable</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Is Reusable</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Is Reusable</em>' attribute.

 	 * @see #isIsReusable()

 	 * @generated

 	 */

@@ -104,10 +106,10 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getReuseMetaInformation_Base_Class()

@@ -120,7 +122,9 @@ public interface ReuseMetaInformation extends TraceableSpecification {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/SelectionCriterion.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/SelectionCriterion.java
index c4edf683560..a5dfad3f3c4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/SelectionCriterion.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/SelectionCriterion.java
@@ -24,33 +24,34 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Selection Criterion</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * A mixed string description, identifying the source elements.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getSelectionCriterion()
  * @model
  * @generated
  */
 public interface SelectionCriterion extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Source</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getSelectionCriterion_Source()
 	 * @model
@@ -62,10 +63,10 @@ public interface SelectionCriterion extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getSelectionCriterion_Base_Class()
@@ -78,7 +79,9 @@ public interface SelectionCriterion extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/Variability.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/Variability.java
index 88ac8ac7925..5629a12ecb8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/Variability.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/Variability.java
@@ -24,37 +24,39 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Variability</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * The collection of variability descriptions, related feature models, and decision models. This collection can be done across the EAST-ADL2 abstraction levels.
+ * The collection of variability descriptions, related feature models, and decision models. This collection can be done across the EAST-ADL2
+ * abstraction levels.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfigurableContainer <em>Configurable Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfiguration <em>Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getProductFeatureModel <em>Product Feature Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getDecisionModel <em>Decision Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getVariableElement <em>Variable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfigurableContainer <em>Configurable Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfiguration <em>Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getProductFeatureModel <em>Product Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getDecisionModel <em>Decision Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.Variability#getVariableElement <em>Variable Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability()
  * @model
  * @generated
  */
 public interface Variability extends Context {
+
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_Base_Class()
@@ -67,7 +69,9 @@ public interface Variability extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
@@ -77,10 +81,10 @@ public interface Variability extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Package</em>' reference.
 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_Base_Package()
@@ -93,7 +97,9 @@ public interface Variability extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Package <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Package</em>' reference.
 	 * @see #getBase_Package()
 	 * @generated
 	 */
@@ -104,10 +110,11 @@ public interface Variability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Configurable Container</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Configurable Container</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Configurable Container</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_ConfigurableContainer()
 	 * @model ordered="false"
@@ -120,10 +127,10 @@ public interface Variability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Configuration</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Configuration</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Configuration</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_Configuration()
 	 * @model ordered="false"
@@ -136,10 +143,10 @@ public interface Variability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Decision Model</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Decision Model</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Decision Model</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_DecisionModel()
 	 * @model ordered="false"
@@ -152,10 +159,11 @@ public interface Variability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Product Feature Model</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Product Feature Model</em>' containment reference list isn't clear, there really should be more of a description
+	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Product Feature Model</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_ProductFeatureModel()
 	 * @model ordered="false"
@@ -168,10 +176,10 @@ public interface Variability extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.variability.VariableElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Variable Element</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Variable Element</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Variable Element</em>' reference list.
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariability_VariableElement()
 	 * @model ordered="false"
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityFactory.java
index 908e8085205..61c1a64b5a4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityFactory.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**

  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage

  * @generated

  */

@@ -28,6 +29,7 @@ public interface VariabilityFactory extends EFactory {
 	/**

 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	VariabilityFactory eINSTANCE = org.eclipse.papyrus.eastadl.variability.impl.VariabilityFactoryImpl.init();

@@ -36,6 +38,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Configurable Container</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Configurable Container</em>'.

 	 * @generated

 	 */

@@ -45,6 +48,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Configuration Decision</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Configuration Decision</em>'.

 	 * @generated

 	 */

@@ -54,6 +58,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Configuration Decision Folder</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Configuration Decision Folder</em>'.

 	 * @generated

 	 */

@@ -63,6 +68,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Container Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Container Configuration</em>'.

 	 * @generated

 	 */

@@ -72,6 +78,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Feature Configuration</em>'.

 	 * @generated

 	 */

@@ -81,6 +88,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Vehicle Level Binding</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Vehicle Level Binding</em>'.

 	 * @generated

 	 */

@@ -90,6 +98,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Internal Binding</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Internal Binding</em>'.

 	 * @generated

 	 */

@@ -99,6 +108,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Private Content</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Private Content</em>'.

 	 * @generated

 	 */

@@ -108,6 +118,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Reuse Meta Information</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Reuse Meta Information</em>'.

 	 * @generated

 	 */

@@ -117,6 +128,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Selection Criterion</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Selection Criterion</em>'.

 	 * @generated

 	 */

@@ -126,6 +138,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Variability</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Variability</em>'.

 	 * @generated

 	 */

@@ -135,6 +148,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Variable Element</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Variable Element</em>'.

 	 * @generated

 	 */

@@ -144,6 +158,7 @@ public interface VariabilityFactory extends EFactory {
 	 * Returns a new object of class '<em>Variation Group</em>'.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return a new object of class '<em>Variation Group</em>'.

 	 * @generated

 	 */

@@ -152,6 +167,7 @@ public interface VariabilityFactory extends EFactory {
 	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityPackage.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityPackage.java
index 1e5651c3e42..9ba381de6fe 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityPackage.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariabilityPackage.java
@@ -55,6 +55,7 @@ public interface VariabilityPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	interface Literals {

@@ -62,6 +63,7 @@ public interface VariabilityPackage extends EPackage {
 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl <em>Variation Group</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariationGroup()

 		 * @generated

@@ -71,6 +73,7 @@ public interface VariabilityPackage extends EPackage {
 		/**

 		 * The meta object literal for the '<em><b>Variable Element</b></em>' reference list feature.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIATION_GROUP__VARIABLE_ELEMENT = eINSTANCE.getVariationGroup_VariableElement();

@@ -100,8 +103,10 @@ public interface VariabilityPackage extends EPackage {
 		EReference VARIATION_GROUP__BASE_CLASS = eINSTANCE.getVariationGroup_Base_Class();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl <em>Reuse Meta Information</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl

+		 * <em>Reuse Meta Information</em>}' class.

 		 * <!-- begin-user-doc --> <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getReuseMetaInformation()

 		 * @generated

@@ -120,6 +125,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl <em>Variability</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariability()

 		 * @generated

@@ -130,6 +136,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__BASE_CLASS = eINSTANCE.getVariability_Base_Class();

@@ -138,6 +145,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__BASE_PACKAGE = eINSTANCE.getVariability_Base_Package();

@@ -146,6 +154,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Configurable Container</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__CONFIGURABLE_CONTAINER = eINSTANCE.getVariability_ConfigurableContainer();

@@ -154,6 +163,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Configuration</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__CONFIGURATION = eINSTANCE.getVariability_Configuration();

@@ -162,6 +172,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Product Feature Model</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__PRODUCT_FEATURE_MODEL = eINSTANCE.getVariability_ProductFeatureModel();

@@ -170,6 +181,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Decision Model</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__DECISION_MODEL = eINSTANCE.getVariability_DecisionModel();

@@ -178,14 +190,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Variable Element</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABILITY__VARIABLE_ELEMENT = eINSTANCE.getVariability_VariableElement();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl <em>Feature Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl

+		 * <em>Feature Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getFeatureConfiguration()

 		 * @generated

@@ -196,14 +211,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Configured Feature Model</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL = eINSTANCE.getFeatureConfiguration_ConfiguredFeatureModel();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl <em>Vehicle Level Binding</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl

+		 * <em>Vehicle Level Binding</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVehicleLevelBinding()

 		 * @generated

@@ -214,6 +232,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source Vehicle Feature Model</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL = eINSTANCE.getVehicleLevelBinding_SourceVehicleFeatureModel();

@@ -222,14 +241,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Feature Model</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL = eINSTANCE.getVehicleLevelBinding_TargetFeatureModel();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl <em>Configuration Decision</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl

+		 * <em>Configuration Decision</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecision()

 		 * @generated

@@ -240,6 +262,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Effect</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute CONFIGURATION_DECISION__EFFECT = eINSTANCE.getConfigurationDecision_Effect();

@@ -248,6 +271,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Criterion</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute CONFIGURATION_DECISION__CRITERION = eINSTANCE.getConfigurationDecision_Criterion();

@@ -256,6 +280,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Equivalence</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute CONFIGURATION_DECISION__IS_EQUIVALENCE = eINSTANCE.getConfigurationDecision_IsEquivalence();

@@ -264,6 +289,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION__TARGET = eINSTANCE.getConfigurationDecision_Target();

@@ -272,14 +298,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Selection Criterion</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION__SELECTION_CRITERION = eINSTANCE.getConfigurationDecision_SelectionCriterion();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl <em>Selection Criterion</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl <em>Selection Criterion</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getSelectionCriterion()

 		 * @generated

@@ -290,6 +319,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SELECTION_CRITERION__SOURCE = eINSTANCE.getSelectionCriterion_Source();

@@ -298,14 +328,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference SELECTION_CRITERION__BASE_CLASS = eINSTANCE.getSelectionCriterion_Base_Class();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl <em>Configuration Decision Folder</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl

+		 * <em>Configuration Decision Folder</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionFolder()

 		 * @generated

@@ -316,14 +349,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Child Entry</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY = eINSTANCE.getConfigurationDecisionFolder_ChildEntry();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl

+		 * <em>Container Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getContainerConfiguration()

 		 * @generated

@@ -334,6 +370,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Configured Container</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER = eINSTANCE.getContainerConfiguration_ConfiguredContainer();

@@ -342,6 +379,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl <em>Private Content</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getPrivateContent()

 		 * @generated

@@ -352,6 +390,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PRIVATE_CONTENT__BASE_CLASS = eINSTANCE.getPrivateContent_Base_Class();

@@ -360,6 +399,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Private Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference PRIVATE_CONTENT__PRIVATE_ELEMENT = eINSTANCE.getPrivateContent_PrivateElement();

@@ -381,9 +421,11 @@ public interface VariabilityPackage extends EPackage {
 		EAttribute REUSE_META_INFORMATION__IS_REUSABLE = eINSTANCE.getReuseMetaInformation_IsReusable();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl <em>Configurable Container</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl

+		 * <em>Configurable Container</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurableContainer()

 		 * @generated

@@ -394,6 +436,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Internal Binding</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__INTERNAL_BINDING = eINSTANCE.getConfigurableContainer_InternalBinding();

@@ -402,6 +445,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Variation Group</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__VARIATION_GROUP = eINSTANCE.getConfigurableContainer_VariationGroup();

@@ -410,6 +454,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__BASE_CLASS = eINSTANCE.getConfigurableContainer_Base_Class();

@@ -418,6 +463,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__BASE_PACKAGE = eINSTANCE.getConfigurableContainer_Base_Package();

@@ -426,6 +472,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Configurable Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT = eINSTANCE.getConfigurableContainer_ConfigurableElement();

@@ -434,6 +481,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Public Feature Model</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL = eINSTANCE.getConfigurableContainer_PublicFeatureModel();

@@ -442,6 +490,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.InternalBindingImpl <em>Internal Binding</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.InternalBindingImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getInternalBinding()

 		 * @generated

@@ -449,9 +498,11 @@ public interface VariabilityPackage extends EPackage {
 		EClass INTERNAL_BINDING = eINSTANCE.getInternalBinding();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl <em>Configuration Decision Model</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl

+		 * <em>Configuration Decision Model</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionModel()

 		 * @generated

@@ -462,6 +513,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION_MODEL__BASE_PACKAGE = eINSTANCE.getConfigurationDecisionModel_Base_Package();

@@ -470,6 +522,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION_MODEL__BASE_CLASS = eINSTANCE.getConfigurationDecisionModel_Base_Class();

@@ -478,14 +531,17 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Root Entry</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION_MODEL__ROOT_ENTRY = eINSTANCE.getConfigurationDecisionModel_RootEntry();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl <em>Configuration Decision Model Entry</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl

+		 * <em>Configuration Decision Model Entry</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionModelEntry()

 		 * @generated

@@ -496,6 +552,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Is Active</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EAttribute CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE = eINSTANCE.getConfigurationDecisionModelEntry_IsActive();

@@ -504,6 +561,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS = eINSTANCE.getConfigurationDecisionModelEntry_Base_Class();

@@ -512,6 +570,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl <em>Variable Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl

 		 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariableElement()

 		 * @generated

@@ -522,6 +581,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Required Binding Time</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABLE_ELEMENT__REQUIRED_BINDING_TIME = eINSTANCE.getVariableElement_RequiredBindingTime();

@@ -530,6 +590,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Reuse Meta Information</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABLE_ELEMENT__REUSE_META_INFORMATION = eINSTANCE.getVariableElement_ReuseMetaInformation();

@@ -538,6 +599,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Optional Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABLE_ELEMENT__OPTIONAL_ELEMENT = eINSTANCE.getVariableElement_OptionalElement();

@@ -546,6 +608,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABLE_ELEMENT__BASE_CLASS = eINSTANCE.getVariableElement_Base_Class();

@@ -554,6 +617,7 @@ public interface VariabilityPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Actual Binding Time</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		EReference VARIABLE_ELEMENT__ACTUAL_BINDING_TIME = eINSTANCE.getVariableElement_ActualBindingTime();

@@ -563,6 +627,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * The package name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNAME = "variability";

@@ -570,6 +635,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * The package namespace URI.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.papyrusuml.org/EAST-ADL2/Variability/1";

@@ -577,6 +643,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * The package namespace name.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "Variability";

@@ -584,6 +651,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	VariabilityPackage eINSTANCE = org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl.init();

@@ -591,6 +659,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl <em>Variation Group</em>}' class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariationGroup()

 	 * @generated

@@ -601,6 +670,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -610,6 +680,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -628,6 +699,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Constraint</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -637,6 +709,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -646,6 +719,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -655,6 +729,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Variable Element</b></em>' reference list.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -670,8 +745,10 @@ public interface VariabilityPackage extends EPackage {
 	int VARIATION_GROUP_FEATURE_COUNT = ElementsPackage.EA_ELEMENT_FEATURE_COUNT + 4;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl <em>Reuse Meta Information</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl <em>Reuse Meta Information</em>}'

+	 * class.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getReuseMetaInformation()

 	 * @generated

@@ -679,9 +756,11 @@ public interface VariabilityPackage extends EPackage {
 	int REUSE_META_INFORMATION = 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl <em>Configurable Container</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl <em>Configurable Container</em>}'

+	 * class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurableContainer()

 	 * @generated

@@ -692,6 +771,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl <em>Variable Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariableElement()

 	 * @generated

@@ -702,6 +782,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl <em>Variability</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVariability()

 	 * @generated

@@ -709,9 +790,11 @@ public interface VariabilityPackage extends EPackage {
 	int VARIABILITY = 7;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl <em>Feature Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl <em>Feature Configuration</em>}'

+	 * class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getFeatureConfiguration()

 	 * @generated

@@ -719,9 +802,11 @@ public interface VariabilityPackage extends EPackage {
 	int FEATURE_CONFIGURATION = 8;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl <em>Configuration Decision</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl <em>Configuration Decision</em>}'

+	 * class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecision()

 	 * @generated

@@ -732,6 +817,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl <em>Selection Criterion</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getSelectionCriterion()

 	 * @generated

@@ -739,9 +825,11 @@ public interface VariabilityPackage extends EPackage {
 	int SELECTION_CRITERION = 11;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl <em>Configuration Decision Folder</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl

+	 * <em>Configuration Decision Folder</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionFolder()

 	 * @generated

@@ -749,9 +837,11 @@ public interface VariabilityPackage extends EPackage {
 	int CONFIGURATION_DECISION_FOLDER = 12;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl <em>Container Configuration</em>}'

+	 * class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getContainerConfiguration()

 	 * @generated

@@ -762,6 +852,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl <em>Private Content</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getPrivateContent()

 	 * @generated

@@ -769,9 +860,11 @@ public interface VariabilityPackage extends EPackage {
 	int PRIVATE_CONTENT = 14;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl <em>Configuration Decision Model</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl

+	 * <em>Configuration Decision Model</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionModel()

 	 * @generated

@@ -782,6 +875,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.InternalBindingImpl <em>Internal Binding</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.InternalBindingImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getInternalBinding()

 	 * @generated

@@ -789,9 +883,11 @@ public interface VariabilityPackage extends EPackage {
 	int INTERNAL_BINDING = 4;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl <em>Configuration Decision Model Entry</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl

+	 * <em>Configuration Decision Model Entry</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getConfigurationDecisionModelEntry()

 	 * @generated

@@ -802,6 +898,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -811,6 +908,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -820,6 +918,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -829,6 +928,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Required Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -838,6 +938,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Actual Binding Time</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -847,6 +948,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Reuse Meta Information</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -856,6 +958,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Optional Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -865,6 +968,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -874,6 +978,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Variable Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -883,6 +988,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -892,6 +998,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -901,6 +1008,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -910,6 +1018,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Packageable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -919,6 +1028,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Note</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -928,6 +1038,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Information</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -937,6 +1048,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Reusable</b></em>' attribute.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -946,6 +1058,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -964,6 +1077,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -973,6 +1087,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -982,6 +1097,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -991,6 +1107,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Internal Binding</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1000,6 +1117,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Variation Group</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1009,6 +1127,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1018,6 +1137,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1027,6 +1147,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Configurable Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1036,6 +1157,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Public Feature Model</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1045,6 +1167,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Configurable Container</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1054,6 +1177,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1063,6 +1187,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1072,6 +1197,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1081,6 +1207,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1090,6 +1217,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1099,6 +1227,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1108,6 +1237,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Configuration Decision Model</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1117,6 +1247,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1126,6 +1257,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1135,6 +1267,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1144,6 +1277,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1153,6 +1287,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1162,6 +1297,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1171,6 +1307,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Internal Binding</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1180,6 +1317,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1189,6 +1327,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1198,6 +1337,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1207,6 +1347,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Active</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1216,6 +1357,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1225,6 +1367,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Configuration Decision Model Entry</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1234,6 +1377,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1243,6 +1387,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1252,6 +1397,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1261,6 +1407,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Traceable Specification</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1270,6 +1417,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Relationship</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1279,6 +1427,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1288,6 +1437,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1297,6 +1447,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Configurable Container</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1306,6 +1457,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Configuration</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1315,6 +1467,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Product Feature Model</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1324,6 +1477,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Decision Model</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1333,6 +1487,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Variable Element</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1342,6 +1497,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Variability</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1351,6 +1507,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1360,6 +1517,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1369,6 +1527,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1378,6 +1537,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1387,6 +1547,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1396,6 +1557,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1405,6 +1567,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Configured Feature Model</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1414,6 +1577,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1423,6 +1587,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl <em>Vehicle Level Binding</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl

 	 * @see org.eclipse.papyrus.eastadl.variability.impl.VariabilityPackageImpl#getVehicleLevelBinding()

 	 * @generated

@@ -1433,6 +1598,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1442,6 +1608,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1451,6 +1618,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1460,6 +1628,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1469,6 +1638,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1478,6 +1648,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1487,6 +1658,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Vehicle Feature Model</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1496,6 +1668,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Feature Model</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1505,6 +1678,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Vehicle Level Binding</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1514,6 +1688,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1523,6 +1698,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1532,6 +1708,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1541,6 +1718,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Active</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1550,6 +1728,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1559,6 +1738,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Effect</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1568,6 +1748,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Criterion</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1577,6 +1758,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Equivalence</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1586,6 +1768,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Target</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1595,6 +1778,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Selection Criterion</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1604,6 +1788,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Configuration Decision</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1613,6 +1798,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1622,6 +1808,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1631,6 +1818,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1640,6 +1828,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Source</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1649,6 +1838,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1658,6 +1848,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Selection Criterion</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1667,6 +1858,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1676,6 +1868,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1685,6 +1878,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1694,6 +1888,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Active</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1703,6 +1898,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1712,6 +1908,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Child Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1721,6 +1918,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Configuration Decision Folder</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1730,6 +1928,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1739,6 +1938,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1748,6 +1948,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1757,6 +1958,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1766,6 +1968,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1775,6 +1978,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Root Entry</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1784,6 +1988,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Configured Container</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1793,6 +1998,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Container Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1802,6 +2008,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1811,6 +2018,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1820,6 +2028,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Comment</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1829,6 +2038,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1838,6 +2048,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The feature id for the '<em><b>Private Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1847,6 +2058,7 @@ public interface VariabilityPackage extends EPackage {
 	 * The number of structural features of the '<em>Private Content</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -1856,6 +2068,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer <em>Configurable Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Configurable Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer

 	 * @generated

@@ -1863,9 +2076,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getConfigurableContainer();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement <em>Configurable Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement

+	 * <em>Configurable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Configurable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getConfigurableElement()

 	 * @see #getConfigurableContainer()

@@ -1874,9 +2089,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurableContainer_ConfigurableElement();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding <em>Internal Binding</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding

+	 * <em>Internal Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Internal Binding</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getInternalBinding()

 	 * @see #getConfigurableContainer()

@@ -1885,9 +2102,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurableContainer_InternalBinding();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel <em>Public Feature Model</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel

+	 * <em>Public Feature Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Public Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getPublicFeatureModel()

 	 * @see #getConfigurableContainer()

@@ -1896,9 +2115,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurableContainer_PublicFeatureModel();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getVariationGroup <em>Variation Group</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getVariationGroup

+	 * <em>Variation Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Variation Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getVariationGroup()

 	 * @see #getConfigurableContainer()

@@ -1907,9 +2128,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurableContainer_VariationGroup();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Class()

 	 * @see #getConfigurableContainer()

@@ -1918,9 +2141,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurableContainer_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer#getBase_Package()

 	 * @see #getConfigurableContainer()

@@ -1932,6 +2157,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision <em>Configuration Decision</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Configuration Decision</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision

 	 * @generated

@@ -1939,9 +2165,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getConfigurationDecision();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion <em>Criterion</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion

+	 * <em>Criterion</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Criterion</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getCriterion()

 	 * @see #getConfigurationDecision()

@@ -1953,6 +2181,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getEffect <em>Effect</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Effect</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getEffect()

 	 * @see #getConfigurationDecision()

@@ -1961,9 +2190,11 @@ public interface VariabilityPackage extends EPackage {
 	EAttribute getConfigurationDecision_Effect();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence <em>Is Equivalence</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence

+	 * <em>Is Equivalence</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Equivalence</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#isIsEquivalence()

 	 * @see #getConfigurationDecision()

@@ -1972,9 +2203,11 @@ public interface VariabilityPackage extends EPackage {
 	EAttribute getConfigurationDecision_IsEquivalence();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion <em>Selection Criterion</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion

+	 * <em>Selection Criterion</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Selection Criterion</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getSelectionCriterion()

 	 * @see #getConfigurationDecision()

@@ -1983,9 +2216,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecision_SelectionCriterion();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getTarget <em>Target</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getTarget <em>Target</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Target</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision#getTarget()

 	 * @see #getConfigurationDecision()

@@ -1994,9 +2229,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecision_Target();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder <em>Configuration Decision Folder</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder

+	 * <em>Configuration Decision Folder</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Configuration Decision Folder</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder

 	 * @generated

@@ -2004,9 +2241,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getConfigurationDecisionFolder();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder#getChildEntry <em>Child Entry</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder#getChildEntry

+	 * <em>Child Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Child Entry</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder#getChildEntry()

 	 * @see #getConfigurationDecisionFolder()

@@ -2015,9 +2254,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecisionFolder_ChildEntry();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel <em>Configuration Decision Model</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel

+	 * <em>Configuration Decision Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Configuration Decision Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel

 	 * @generated

@@ -2025,9 +2266,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getConfigurationDecisionModel();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package <em>Base Package</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package

+	 * <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Package()

 	 * @see #getConfigurationDecisionModel()

@@ -2036,9 +2279,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecisionModel_Base_Package();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getBase_Class()

 	 * @see #getConfigurationDecisionModel()

@@ -2047,9 +2292,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecisionModel_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getRootEntry <em>Root Entry</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getRootEntry

+	 * <em>Root Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Root Entry</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel#getRootEntry()

 	 * @see #getConfigurationDecisionModel()

@@ -2058,9 +2305,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getConfigurationDecisionModel_RootEntry();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry <em>Configuration Decision Model Entry</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry

+	 * <em>Configuration Decision Model Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Configuration Decision Model Entry</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry

 	 * @generated

@@ -2068,9 +2317,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getConfigurationDecisionModelEntry();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive <em>Is Active</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive

+	 * <em>Is Active</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Active</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#isIsActive()

 	 * @see #getConfigurationDecisionModelEntry()

@@ -2079,9 +2330,11 @@ public interface VariabilityPackage extends EPackage {
 	EAttribute getConfigurationDecisionModelEntry_IsActive();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry#getBase_Class()

 	 * @see #getConfigurationDecisionModelEntry()

@@ -2093,6 +2346,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration <em>Container Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Container Configuration</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ContainerConfiguration

 	 * @generated

@@ -2100,9 +2354,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getContainerConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer <em>Configured Container</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer

+	 * <em>Configured Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Configured Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ContainerConfiguration#getConfiguredContainer()

 	 * @see #getContainerConfiguration()

@@ -2114,6 +2370,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration <em>Feature Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Feature Configuration</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.FeatureConfiguration

 	 * @generated

@@ -2121,9 +2378,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getFeatureConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel <em>Configured Feature Model</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel

+	 * <em>Configured Feature Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Configured Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.FeatureConfiguration#getConfiguredFeatureModel()

 	 * @see #getFeatureConfiguration()

@@ -2135,6 +2394,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding <em>Vehicle Level Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Vehicle Level Binding</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding

 	 * @generated

@@ -2142,9 +2402,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getVehicleLevelBinding();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}'.

+	 * Returns the meta object for the reference list '

+	 * {@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Source Vehicle Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getSourceVehicleFeatureModel()

 	 * @see #getVehicleLevelBinding()

@@ -2153,9 +2415,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVehicleLevelBinding_SourceVehicleFeatureModel();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getTargetFeatureModel <em>Target Feature Model</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getTargetFeatureModel

+	 * <em>Target Feature Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Target Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getTargetFeatureModel()

 	 * @see #getVehicleLevelBinding()

@@ -2167,6 +2431,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.InternalBinding <em>Internal Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Internal Binding</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.InternalBinding

 	 * @generated

@@ -2177,6 +2442,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent <em>Private Content</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Private Content</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.PrivateContent

 	 * @generated

@@ -2187,6 +2453,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.PrivateContent#getBase_Class()

 	 * @see #getPrivateContent()

@@ -2195,9 +2462,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getPrivateContent_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement <em>Private Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement

+	 * <em>Private Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Private Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.PrivateContent#getPrivateElement()

 	 * @see #getPrivateContent()

@@ -2208,6 +2477,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation <em>Reuse Meta Information</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Reuse Meta Information</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation

 	 * @generated

@@ -2215,8 +2485,10 @@ public interface VariabilityPackage extends EPackage {
 	EClass getReuseMetaInformation();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation <em>Information</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation

+	 * <em>Information</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Information</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getInformation()

 	 * @see #getReuseMetaInformation()

@@ -2225,8 +2497,10 @@ public interface VariabilityPackage extends EPackage {
 	EAttribute getReuseMetaInformation_Information();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable <em>Is Reusable</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable

+	 * <em>Is Reusable</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Is Reusable</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#isIsReusable()

 	 * @see #getReuseMetaInformation()

@@ -2235,9 +2509,11 @@ public interface VariabilityPackage extends EPackage {
 	EAttribute getReuseMetaInformation_IsReusable();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class

+	 * <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation#getBase_Class()

 	 * @see #getReuseMetaInformation()

@@ -2249,6 +2525,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion <em>Selection Criterion</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Selection Criterion</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.SelectionCriterion

 	 * @generated

@@ -2259,6 +2536,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getSource <em>Source</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Source</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getSource()

 	 * @see #getSelectionCriterion()

@@ -2267,9 +2545,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getSelectionCriterion_Source();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class <em>Base Class</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class <em>Base Class</em>}

+	 * '.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.SelectionCriterion#getBase_Class()

 	 * @see #getSelectionCriterion()

@@ -2281,6 +2561,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.Variability <em>Variability</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Variability</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability

 	 * @generated

@@ -2291,6 +2572,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getBase_Class()

 	 * @see #getVariability()

@@ -2302,6 +2584,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.Variability#getBase_Package <em>Base Package</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Package</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getBase_Package()

 	 * @see #getVariability()

@@ -2310,9 +2593,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariability_Base_Package();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfigurableContainer <em>Configurable Container</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfigurableContainer

+	 * <em>Configurable Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Configurable Container</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getConfigurableContainer()

 	 * @see #getVariability()

@@ -2321,9 +2606,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariability_ConfigurableContainer();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfiguration <em>Configuration</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getConfiguration

+	 * <em>Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Configuration</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getConfiguration()

 	 * @see #getVariability()

@@ -2332,9 +2619,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariability_Configuration();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getDecisionModel <em>Decision Model</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getDecisionModel

+	 * <em>Decision Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Decision Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getDecisionModel()

 	 * @see #getVariability()

@@ -2343,9 +2632,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariability_DecisionModel();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getProductFeatureModel <em>Product Feature Model</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getProductFeatureModel

+	 * <em>Product Feature Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Product Feature Model</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getProductFeatureModel()

 	 * @see #getVariability()

@@ -2354,9 +2645,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariability_ProductFeatureModel();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getVariableElement <em>Variable Element</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.Variability#getVariableElement

+	 * <em>Variable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Variable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability#getVariableElement()

 	 * @see #getVariability()

@@ -2368,6 +2661,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -2377,6 +2671,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.VariableElement <em>Variable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Variable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement

 	 * @generated

@@ -2384,9 +2679,11 @@ public interface VariabilityPackage extends EPackage {
 	EClass getVariableElement();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime <em>Actual Binding Time</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime

+	 * <em>Actual Binding Time</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Actual Binding Time</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime()

 	 * @see #getVariableElement()

@@ -2395,9 +2692,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariableElement_ActualBindingTime();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement <em>Optional Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement

+	 * <em>Optional Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Optional Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement()

 	 * @see #getVariableElement()

@@ -2409,6 +2708,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement#getBase_Class()

 	 * @see #getVariableElement()

@@ -2417,9 +2717,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariableElement_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime <em>Required Binding Time</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime

+	 * <em>Required Binding Time</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Required Binding Time</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime()

 	 * @see #getVariableElement()

@@ -2428,9 +2730,11 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariableElement_RequiredBindingTime();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation <em>Reuse Meta Information</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation

+	 * <em>Reuse Meta Information</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Reuse Meta Information</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation()

 	 * @see #getVariableElement()

@@ -2441,6 +2745,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup <em>Variation Group</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for class '<em>Variation Group</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup

 	 * @generated

@@ -2450,6 +2755,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getConstraint <em>Constraint</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Constraint</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup#getConstraint()

 	 * @see #getVariationGroup()

@@ -2460,6 +2766,7 @@ public interface VariabilityPackage extends EPackage {
 	/**

 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getKind <em>Kind</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the attribute '<em>Kind</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup#getKind()

 	 * @see #getVariationGroup()

@@ -2471,6 +2778,7 @@ public interface VariabilityPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getBase_Class <em>Base Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference '<em>Base Class</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup#getBase_Class()

 	 * @see #getVariationGroup()

@@ -2479,8 +2787,10 @@ public interface VariabilityPackage extends EPackage {
 	EReference getVariationGroup_Base_Class();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getVariableElement <em>Variable Element</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getVariableElement

+	 * <em>Variable Element</em>}'.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the meta object for the reference list '<em>Variable Element</em>'.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup#getVariableElement()

 	 * @see #getVariationGroup()

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariableElement.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariableElement.java
index ebecb7cc65b..95047fa76c4 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariableElement.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariableElement.java
@@ -24,17 +24,22 @@ import org.eclipse.uml2.uml.NamedElement;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Variable Element</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
- * VariableElement is a marker class that marks an artifact element denoted by association optionalElement as being optional, i.e. it will not be present in all configurations of the complete system. A typical example is an optional FunctionPrototype.
+ * VariableElement is a marker class that marks an artifact element denoted by association optionalElement as being optional, i.e. it will not be
+ * present in all configurations of the complete system. A typical example is an optional FunctionPrototype.
  * 
- * In addition, the VariableElement can be used to extend the EAST-ADL2 variability approach to other languages and standards by pointing from the VariableElement to the respective (non EAST-ADL2) element with association optionalElement, by that marking the non EAST-ADL2 element as optional and providing configuration support within its containing ConfigurableContainer.
+ * In addition, the VariableElement can be used to extend the EAST-ADL2 variability approach to other languages and standards by pointing from the
+ * VariableElement to the respective (non EAST-ADL2) element with association optionalElement, by that marking the non EAST-ADL2 element as optional
+ * and providing configuration support within its containing ConfigurableContainer.
  * 
- * Refer to the documentation of meta-class ConfigurableContainer for a detailed explanation of how ConfigurableContainer and VariableElement play together.
+ * Refer to the documentation of meta-class ConfigurableContainer for a detailed explanation of how ConfigurableContainer and VariableElement play
+ * together.
  * 
  * 
  * Constraints:
- * [1] Identifies either one FunctionPrototype or one FunctionPort or one FunctionConnector or one HardwareComponentPrototype or one HardwarePort or one ClampConnector.
+ * [1] Identifies either one FunctionPrototype or one FunctionPort or one FunctionConnector or one HardwareComponentPrototype or one HardwarePort or
+ * one ClampConnector.
  * 
  * Semantics:
  * Marks the element identified by association optionalElement as optional.
@@ -42,27 +47,29 @@ import org.eclipse.uml2.uml.NamedElement;
  * Extension:
  * Class
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime <em>Required Binding Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime <em>Actual Binding Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation <em>Reuse Meta Information</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement <em>Optional Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime <em>Required Binding Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime <em>Actual Binding Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation <em>Reuse Meta Information</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement <em>Optional Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement()
  * @model
  * @generated
  */
 public interface VariableElement extends EAElement {
+
 	/**
 	 * Returns the value of the '<em><b>Actual Binding Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Actual Binding Time</em>' reference.
 	 * @see #setActualBindingTime(BindingTime)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement_ActualBindingTime()
@@ -75,10 +82,10 @@ public interface VariableElement extends EAElement {
 	 * Returns the value of the '<em><b>Optional Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Optional Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Optional Element</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Optional Element</em>' reference.
 	 * @see #setOptionalElement(NamedElement)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement_OptionalElement()
@@ -91,10 +98,10 @@ public interface VariableElement extends EAElement {
 	 * Returns the value of the '<em><b>Required Binding Time</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Required Binding Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Required Binding Time</em>' containment reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Required Binding Time</em>' reference.
 	 * @see #setRequiredBindingTime(BindingTime)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement_RequiredBindingTime()
@@ -107,6 +114,7 @@ public interface VariableElement extends EAElement {
 	 * Returns the value of the '<em><b>Reuse Meta Information</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Reuse Meta Information</em>' reference.
 	 * @see #setReuseMetaInformation(ReuseMetaInformation)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement_ReuseMetaInformation()
@@ -116,10 +124,13 @@ public interface VariableElement extends EAElement {
 	ReuseMetaInformation getReuseMetaInformation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime <em>Actual Binding Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getActualBindingTime <em>Actual Binding Time</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Binding Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Actual Binding Time</em>' reference.
 	 * @see #getActualBindingTime()
 	 * @generated
 	 */
@@ -129,7 +140,9 @@ public interface VariableElement extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getOptionalElement <em>Optional Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Optional Element</em>' reference.
 	 * @see #getOptionalElement()
 	 * @generated
 	 */
@@ -139,10 +152,10 @@ public interface VariableElement extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Base Class</em>' reference.
 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariableElement_Base_Class()
@@ -155,27 +168,35 @@ public interface VariableElement extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getBase_Class <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Base Class</em>' reference.
 	 * @see #getBase_Class()
 	 * @generated
 	 */
 	void setBase_Class(org.eclipse.uml2.uml.Class value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime <em>Required Binding Time</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getRequiredBindingTime <em>Required Binding Time</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Required Binding Time</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Required Binding Time</em>' reference.
 	 * @see #getRequiredBindingTime()
 	 * @generated
 	 */
 	void setRequiredBindingTime(BindingTime value);
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation <em>Reuse Meta Information</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariableElement#getReuseMetaInformation <em>Reuse Meta Information</em>}'
+	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reuse Meta Information</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Reuse Meta Information</em>' reference.
 	 * @see #getReuseMetaInformation()
 	 * @generated
 	 */
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariationGroup.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariationGroup.java
index eee06aa83c4..284016ad1c8 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariationGroup.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VariationGroup.java
@@ -23,28 +23,30 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependen
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Variation Group</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * A VariationGroup defines a relation between an arbitrary number of VariableElements. It is primarily intended for defining how these VariableElements may be combined (e.g. one requires the other, alternative, etc.).

+ * A VariationGroup defines a relation between an arbitrary number of VariableElements. It is primarily intended for defining how these

+ * VariableElements may be combined (e.g. one requires the other, alternative, etc.).

  * 

  * 

  * Semantics:

- * Defines a dependency or constraint between the variable elements denoted by association variableElement. The actual constraint is specified by attribute kind.

+ * Defines a dependency or constraint between the variable elements denoted by association variableElement. The actual constraint is specified by

+ * attribute kind.

  * 

  * Extension:

  * Class

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getConstraint <em>Constraint</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getKind <em>Kind</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getVariableElement <em>Variable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getConstraint <em>Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getKind <em>Kind</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getVariableElement <em>Variable Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariationGroup()

  * @model

  * @generated

@@ -55,10 +57,10 @@ public interface VariationGroup extends EAElement {
 	 * Returns the value of the '<em><b>Constraint</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Constraint</em>' attribute isn't clear, there really should be

-	 * more of a description here...

+	 * If the meaning of the '<em>Constraint</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Constraint</em>' attribute.

 	 * @see #setConstraint(String)

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariationGroup_Constraint()

@@ -68,13 +70,11 @@ public interface VariationGroup extends EAElement {
 	String getConstraint();

 

 	/**

-	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The default value is

-	 * <code>"exclude"</code>. The literals are from the enumeration

+	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The default value is <code>"exclude"</code>. The literals are from the enumeration

 	 * {@link com.cea.papyrus.uml4eastadl.eastadl.variability.VariationGroupKind}. <!--

 	 * begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a

-	 * description here...

+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> Type of constraint involved. Default is

 	 * EXCLUDE <!-- end-model-doc -->

@@ -91,12 +91,10 @@ public interface VariationGroup extends EAElement {
 	/**

 	 * Returns the value of the '<em><b>Variable Element</b></em>' reference list. The list contents

 	 * are of type {@link com.cea.papyrus.uml4eastadl.eastadl.variability.ADLVariableElement}. It is

-	 * bidirectional and its opposite is '

-	 * {@link com.cea.papyrus.uml4eastadl.eastadl.variability.ADLVariableElement#getVariationGroup

+	 * bidirectional and its opposite is ' {@link com.cea.papyrus.uml4eastadl.eastadl.variability.ADLVariableElement#getVariationGroup

 	 * <em>Variation Group</em>}'. <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Variable Element</em>' reference list isn't clear, there really

-	 * should be more of a description here...

+	 * If the meaning of the '<em>Variable Element</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc --> <!-- begin-model-doc --> Associated variable elements <!--

 	 * end-model-doc -->

@@ -112,7 +110,9 @@ public interface VariationGroup extends EAElement {
 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getConstraint <em>Constraint</em>}' attribute.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Constraint</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Constraint</em>' attribute.

 	 * @see #getConstraint()

 	 * @generated

 	 */

@@ -122,7 +122,9 @@ public interface VariationGroup extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getKind <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Kind</em>' attribute.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.VariabilityDependencyKind

 	 * @see #getKind()

 	 * @generated

@@ -133,10 +135,10 @@ public interface VariationGroup extends EAElement {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVariationGroup_Base_Class()

@@ -149,7 +151,9 @@ public interface VariationGroup extends EAElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.variability.VariationGroup#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VehicleLevelBinding.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VehicleLevelBinding.java
index 1f597ec69e9..865c1b4e980 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VehicleLevelBinding.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/VehicleLevelBinding.java
@@ -22,39 +22,45 @@ import org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Vehicle Level Binding</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * This class represents a ConfigurationDecisionModel on vehicle level with explicitly defined source and target feature models. The source feature models must be on vehicle level, but the target feature models may be located on artifact level, e.g. the public feature model of the top-level FunctionType in the FDA. This way, a VehicleLevelConfigurationDecisionModel may be used to bridge the gap from vehicle level variability management to that on artifact level.

+ * This class represents a ConfigurationDecisionModel on vehicle level with explicitly defined source and target feature models. The source feature

+ * models must be on vehicle level, but the target feature models may be located on artifact level, e.g. the public feature model of the top-level

+ * FunctionType in the FDA. This way, a VehicleLevelConfigurationDecisionModel may be used to bridge the gap from vehicle level variability management

+ * to that on artifact level.

  * 

- * Source feature models may be either the core technical feature model (as defined by association technicalFeatureModel of meta-class VehicleLevel) or one of the optional product feature models (as defined by association productFeatureModel of meta-class Variability in the variability extension).

+ * Source feature models may be either the core technical feature model (as defined by association technicalFeatureModel of meta-class VehicleLevel)

+ * or one of the optional product feature models (as defined by association productFeatureModel of meta-class Variability in the variability

+ * extension).

  * 

  * Constraints:

  * [1] The sourceVehicleFeatureModels shall only contain VehicleFeatures.

  * [2] The sourceVehicleFeatureModels shall be different from the targetFeatureModels

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getTargetFeatureModel <em>Target Feature Model</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding#getTargetFeatureModel <em>Target Feature Model</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVehicleLevelBinding()

  * @model

  * @generated

  */

 public interface VehicleLevelBinding extends ConfigurationDecisionModel {

+

 	/**

 	 * Returns the value of the '<em><b>Source Vehicle Feature Model</b></em>' reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Source Vehicle Feature Model</em>' reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Source Vehicle Feature Model</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Source Vehicle Feature Model</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVehicleLevelBinding_SourceVehicleFeatureModel()

 	 * @model

@@ -67,10 +73,10 @@ public interface VehicleLevelBinding extends ConfigurationDecisionModel {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Target Feature Model</em>' reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Target Feature Model</em>' reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Target Feature Model</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#getVehicleLevelBinding_TargetFeatureModel()

 	 * @model

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurableContainerImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurableContainerImpl.java
index 04eafc1996b..88b16954438 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurableContainerImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurableContainerImpl.java
@@ -39,22 +39,24 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getInternalBinding <em>Internal Binding</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getVariationGroup <em>Variation Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getConfigurableElement <em>Configurable Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getPublicFeatureModel <em>Public Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getInternalBinding <em>Internal Binding</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getVariationGroup <em>Variation Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getConfigurableElement <em>Configurable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurableContainerImpl#getPublicFeatureModel <em>Public Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ConfigurableContainerImpl extends EAElementImpl implements ConfigurableContainer {
+
 	/**
 	 * The cached value of the '{@link #getInternalBinding() <em>Internal Binding</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getInternalBinding()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	 * The cached value of the '{@link #getVariationGroup() <em>Variation Group</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVariationGroup()
 	 * @generated
 	 * @ordered
@@ -75,6 +78,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -85,6 +89,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -95,6 +100,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	 * The cached value of the '{@link #getConfigurableElement() <em>Configurable Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConfigurableElement()
 	 * @generated
 	 * @ordered
@@ -105,6 +111,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	 * The cached value of the '{@link #getPublicFeatureModel() <em>Public Feature Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPublicFeatureModel()
 	 * @generated
 	 * @ordered
@@ -114,6 +121,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConfigurableContainerImpl() {
@@ -123,6 +131,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetConfigurableElement() {
@@ -132,6 +141,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InternalBinding basicGetInternalBinding() {
@@ -141,6 +151,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureModel basicGetPublicFeatureModel() {
@@ -150,28 +161,34 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
-				if (resolve) return getInternalBinding();
-				return basicGetInternalBinding();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
-				return getVariationGroup();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
-				if (resolve) return getConfigurableElement();
-				return basicGetConfigurableElement();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
-				if (resolve) return getPublicFeatureModel();
-				return basicGetPublicFeatureModel();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
+			if(resolve)
+				return getInternalBinding();
+			return basicGetInternalBinding();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
+			return getVariationGroup();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
+			if(resolve)
+				return getConfigurableElement();
+			return basicGetConfigurableElement();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
+			if(resolve)
+				return getPublicFeatureModel();
+			return basicGetPublicFeatureModel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -179,23 +196,24 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
-				return internalBinding != null;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
-				return variationGroup != null && !variationGroup.isEmpty();
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
-				return base_Class != null;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
-				return base_Package != null;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
-				return configurableElement != null;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
-				return publicFeatureModel != null;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
+			return internalBinding != null;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
+			return variationGroup != null && !variationGroup.isEmpty();
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
+			return base_Class != null;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
+			return base_Package != null;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
+			return configurableElement != null;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
+			return publicFeatureModel != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -203,31 +221,32 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
-				setInternalBinding((InternalBinding)newValue);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
-				getVariationGroup().clear();
-				getVariationGroup().addAll((Collection<? extends VariationGroup>)newValue);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
-				setConfigurableElement((NamedElement)newValue);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
-				setPublicFeatureModel((FeatureModel)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
+			setInternalBinding((InternalBinding)newValue);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
+			getVariationGroup().clear();
+			getVariationGroup().addAll((Collection<? extends VariationGroup>)newValue);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
+			setConfigurableElement((NamedElement)newValue);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
+			setPublicFeatureModel((FeatureModel)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -235,6 +254,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -245,29 +265,30 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
-				setInternalBinding((InternalBinding)null);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
-				getVariationGroup().clear();
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
-				setConfigurableElement((NamedElement)null);
-				return;
-			case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
-				setPublicFeatureModel((FeatureModel)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING:
+			setInternalBinding((InternalBinding)null);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP:
+			getVariationGroup().clear();
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT:
+			setConfigurableElement((NamedElement)null);
+			return;
+		case VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL:
+			setPublicFeatureModel((FeatureModel)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -275,14 +296,15 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getConfigurableElement() {
-		if (configurableElement != null && configurableElement.eIsProxy()) {
+		if(configurableElement != null && configurableElement.eIsProxy()) {
 			InternalEObject oldConfigurableElement = (InternalEObject)configurableElement;
 			configurableElement = (NamedElement)eResolveProxy(oldConfigurableElement);
-			if (configurableElement != oldConfigurableElement) {
-				if (eNotificationRequired())
+			if(configurableElement != oldConfigurableElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT, oldConfigurableElement, configurableElement));
 			}
 		}
@@ -292,14 +314,15 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public InternalBinding getInternalBinding() {
-		if (internalBinding != null && internalBinding.eIsProxy()) {
+		if(internalBinding != null && internalBinding.eIsProxy()) {
 			InternalEObject oldInternalBinding = (InternalEObject)internalBinding;
 			internalBinding = (InternalBinding)eResolveProxy(oldInternalBinding);
-			if (internalBinding != oldInternalBinding) {
-				if (eNotificationRequired())
+			if(internalBinding != oldInternalBinding) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING, oldInternalBinding, internalBinding));
 			}
 		}
@@ -309,14 +332,15 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureModel getPublicFeatureModel() {
-		if (publicFeatureModel != null && publicFeatureModel.eIsProxy()) {
+		if(publicFeatureModel != null && publicFeatureModel.eIsProxy()) {
 			InternalEObject oldPublicFeatureModel = (InternalEObject)publicFeatureModel;
 			publicFeatureModel = (FeatureModel)eResolveProxy(oldPublicFeatureModel);
-			if (publicFeatureModel != oldPublicFeatureModel) {
-				if (eNotificationRequired())
+			if(publicFeatureModel != oldPublicFeatureModel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL, oldPublicFeatureModel, publicFeatureModel));
 			}
 		}
@@ -326,10 +350,11 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VariationGroup> getVariationGroup() {
-		if (variationGroup == null) {
+		if(variationGroup == null) {
 			variationGroup = new EObjectResolvingEList<VariationGroup>(VariationGroup.class, this, VariabilityPackage.CONFIGURABLE_CONTAINER__VARIATION_GROUP);
 		}
 		return variationGroup;
@@ -338,14 +363,15 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -355,6 +381,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -364,26 +391,28 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -393,6 +422,7 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -402,48 +432,52 @@ public class ConfigurableContainerImpl extends EAElementImpl implements Configur
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURABLE_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setConfigurableElement(NamedElement newConfigurableElement) {
 		NamedElement oldConfigurableElement = configurableElement;
 		configurableElement = newConfigurableElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURABLE_CONTAINER__CONFIGURABLE_ELEMENT, oldConfigurableElement, configurableElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setInternalBinding(InternalBinding newInternalBinding) {
 		InternalBinding oldInternalBinding = internalBinding;
 		internalBinding = newInternalBinding;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURABLE_CONTAINER__INTERNAL_BINDING, oldInternalBinding, internalBinding));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPublicFeatureModel(FeatureModel newPublicFeatureModel) {
 		FeatureModel oldPublicFeatureModel = publicFeatureModel;
 		publicFeatureModel = newPublicFeatureModel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURABLE_CONTAINER__PUBLIC_FEATURE_MODEL, oldPublicFeatureModel, publicFeatureModel));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionFolderImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionFolderImpl.java
index 159f8e84317..a091833d34c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionFolderImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionFolderImpl.java
@@ -32,17 +32,19 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl#getChildEntry <em>Child Entry</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionFolderImpl#getChildEntry <em>Child Entry</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelEntryImpl implements ConfigurationDecisionFolder {
+
 	/**
 	 * The cached value of the '{@link #getChildEntry() <em>Child Entry</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getChildEntry()
 	 * @generated
 	 * @ordered
@@ -52,6 +54,7 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConfigurationDecisionFolderImpl() {
@@ -61,13 +64,14 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
-				return getChildEntry();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
+			return getChildEntry();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -75,13 +79,14 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
-				return childEntry != null && !childEntry.isEmpty();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
+			return childEntry != null && !childEntry.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -89,16 +94,17 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
-				getChildEntry().clear();
-				getChildEntry().addAll((Collection<? extends ConfigurationDecisionModelEntry>)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
+			getChildEntry().clear();
+			getChildEntry().addAll((Collection<? extends ConfigurationDecisionModelEntry>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -106,6 +112,7 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,14 +123,15 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
-				getChildEntry().clear();
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY:
+			getChildEntry().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -131,10 +139,11 @@ public class ConfigurationDecisionFolderImpl extends ConfigurationDecisionModelE
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ConfigurationDecisionModelEntry> getChildEntry() {
-		if (childEntry == null) {
+		if(childEntry == null) {
 			childEntry = new EObjectResolvingEList<ConfigurationDecisionModelEntry>(ConfigurationDecisionModelEntry.class, this, VariabilityPackage.CONFIGURATION_DECISION_FOLDER__CHILD_ENTRY);
 		}
 		return childEntry;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionImpl.java
index 6634cce1e65..447b2f36beb 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionImpl.java
@@ -36,21 +36,23 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getEffect <em>Effect</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getCriterion <em>Criterion</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#isIsEquivalence <em>Is Equivalence</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getSelectionCriterion <em>Selection Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getEffect <em>Effect</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getCriterion <em>Criterion</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#isIsEquivalence <em>Is Equivalence</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getTarget <em>Target</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionImpl#getSelectionCriterion <em>Selection Criterion</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryImpl implements ConfigurationDecision {
+
 	/**
 	 * The default value of the '{@link #getEffect() <em>Effect</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEffect()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The cached value of the '{@link #getEffect() <em>Effect</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getEffect()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The default value of the '{@link #getCriterion() <em>Criterion</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCriterion()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The cached value of the '{@link #getCriterion() <em>Criterion</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getCriterion()
 	 * @generated
 	 * @ordered
@@ -91,6 +96,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The default value of the '{@link #isIsEquivalence() <em>Is Equivalence</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsEquivalence()
 	 * @generated
 	 * @ordered
@@ -101,6 +107,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The cached value of the '{@link #isIsEquivalence() <em>Is Equivalence</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsEquivalence()
 	 * @generated
 	 * @ordered
@@ -111,6 +118,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTarget()
 	 * @generated
 	 * @ordered
@@ -121,6 +129,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	 * The cached value of the '{@link #getSelectionCriterion() <em>Selection Criterion</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSelectionCriterion()
 	 * @generated
 	 * @ordered
@@ -130,6 +139,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConfigurationDecisionImpl() {
@@ -139,6 +149,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SelectionCriterion basicGetSelectionCriterion() {
@@ -148,22 +159,24 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
-				return getEffect();
-			case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
-				return getCriterion();
-			case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
-				return isIsEquivalence();
-			case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
-				return getTarget();
-			case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
-				if (resolve) return getSelectionCriterion();
-				return basicGetSelectionCriterion();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
+			return getEffect();
+		case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
+			return getCriterion();
+		case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
+			return isIsEquivalence();
+		case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
+			return getTarget();
+		case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
+			if(resolve)
+				return getSelectionCriterion();
+			return basicGetSelectionCriterion();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -171,21 +184,22 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
-				return EFFECT_EDEFAULT == null ? effect != null : !EFFECT_EDEFAULT.equals(effect);
-			case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
-				return CRITERION_EDEFAULT == null ? criterion != null : !CRITERION_EDEFAULT.equals(criterion);
-			case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
-				return isEquivalence != IS_EQUIVALENCE_EDEFAULT;
-			case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
-				return target != null && !target.isEmpty();
-			case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
-				return selectionCriterion != null;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
+			return EFFECT_EDEFAULT == null ? effect != null : !EFFECT_EDEFAULT.equals(effect);
+		case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
+			return CRITERION_EDEFAULT == null ? criterion != null : !CRITERION_EDEFAULT.equals(criterion);
+		case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
+			return isEquivalence != IS_EQUIVALENCE_EDEFAULT;
+		case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
+			return target != null && !target.isEmpty();
+		case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
+			return selectionCriterion != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -193,28 +207,29 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
-				setEffect((String)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
-				setCriterion((String)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
-				setIsEquivalence((Boolean)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
-				getTarget().clear();
-				getTarget().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
-				setSelectionCriterion((SelectionCriterion)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
+			setEffect((String)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
+			setCriterion((String)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
+			setIsEquivalence((Boolean)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
+			getTarget().clear();
+			getTarget().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
+			setSelectionCriterion((SelectionCriterion)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -222,6 +237,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,26 +248,27 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
-				setEffect(EFFECT_EDEFAULT);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
-				setCriterion(CRITERION_EDEFAULT);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
-				setIsEquivalence(IS_EQUIVALENCE_EDEFAULT);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
-				getTarget().clear();
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
-				setSelectionCriterion((SelectionCriterion)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION__EFFECT:
+			setEffect(EFFECT_EDEFAULT);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__CRITERION:
+			setCriterion(CRITERION_EDEFAULT);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE:
+			setIsEquivalence(IS_EQUIVALENCE_EDEFAULT);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__TARGET:
+			getTarget().clear();
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION:
+			setSelectionCriterion((SelectionCriterion)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -259,6 +276,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCriterion() {
@@ -268,6 +286,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getEffect() {
@@ -277,14 +296,15 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public SelectionCriterion getSelectionCriterion() {
-		if (selectionCriterion != null && selectionCriterion.eIsProxy()) {
+		if(selectionCriterion != null && selectionCriterion.eIsProxy()) {
 			InternalEObject oldSelectionCriterion = (InternalEObject)selectionCriterion;
 			selectionCriterion = (SelectionCriterion)eResolveProxy(oldSelectionCriterion);
-			if (selectionCriterion != oldSelectionCriterion) {
-				if (eNotificationRequired())
+			if(selectionCriterion != oldSelectionCriterion) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION, oldSelectionCriterion, selectionCriterion));
 			}
 		}
@@ -294,10 +314,11 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getTarget() {
-		if (target == null) {
+		if(target == null) {
 			target = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, VariabilityPackage.CONFIGURATION_DECISION__TARGET);
 		}
 		return target;
@@ -306,6 +327,7 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsEquivalence() {
@@ -315,59 +337,65 @@ public class ConfigurationDecisionImpl extends ConfigurationDecisionModelEntryIm
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCriterion(String newCriterion) {
 		String oldCriterion = criterion;
 		criterion = newCriterion;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION__CRITERION, oldCriterion, criterion));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEffect(String newEffect) {
 		String oldEffect = effect;
 		effect = newEffect;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION__EFFECT, oldEffect, effect));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsEquivalence(boolean newIsEquivalence) {
 		boolean oldIsEquivalence = isEquivalence;
 		isEquivalence = newIsEquivalence;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION__IS_EQUIVALENCE, oldIsEquivalence, isEquivalence));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSelectionCriterion(SelectionCriterion newSelectionCriterion) {
 		SelectionCriterion oldSelectionCriterion = selectionCriterion;
 		selectionCriterion = newSelectionCriterion;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION__SELECTION_CRITERION, oldSelectionCriterion, selectionCriterion));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (effect: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelEntryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelEntryImpl.java
index 591d90347fa..6c0404cde47 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelEntryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelEntryImpl.java
@@ -31,18 +31,20 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl#isIsActive <em>Is Active</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl#isIsActive <em>Is Active</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelEntryImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl implements ConfigurationDecisionModelEntry {
+
 	/**
 	 * The default value of the '{@link #isIsActive() <em>Is Active</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsActive()
 	 * @generated
 	 * @ordered
@@ -53,6 +55,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	 * The cached value of the '{@link #isIsActive() <em>Is Active</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isIsActive()
 	 * @generated
 	 * @ordered
@@ -63,6 +66,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConfigurationDecisionModelEntryImpl() {
@@ -81,16 +86,18 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
-				return isIsActive();
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
+			return isIsActive();
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -98,15 +105,16 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
-				return isActive != IS_ACTIVE_EDEFAULT;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
+			return isActive != IS_ACTIVE_EDEFAULT;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -114,17 +122,18 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
-				setIsActive((Boolean)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
+			setIsActive((Boolean)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -132,6 +141,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,17 +152,18 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
-				setIsActive(IS_ACTIVE_EDEFAULT);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE:
+			setIsActive(IS_ACTIVE_EDEFAULT);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -160,6 +171,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isIsActive() {
@@ -169,26 +181,28 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsActive(boolean newIsActive) {
 		boolean oldIsActive = isActive;
 		isActive = newIsActive;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__IS_ACTIVE, oldIsActive, isActive));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -198,6 +212,7 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -207,23 +222,26 @@ public abstract class ConfigurationDecisionModelEntryImpl extends EAElementImpl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if(eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isActive: ");
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelImpl.java
index 49cf5cf32f1..08d5b10de2b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ConfigurationDecisionModelImpl.java
@@ -36,19 +36,21 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getRootEntry <em>Root Entry</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ConfigurationDecisionModelImpl#getRootEntry <em>Root Entry</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ConfigurationDecisionModelImpl extends EAElementImpl implements ConfigurationDecisionModel {
+
 	/**
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	 * The cached value of the '{@link #getRootEntry() <em>Root Entry</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRootEntry()
 	 * @generated
 	 * @ordered
@@ -78,6 +82,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ConfigurationDecisionModelImpl() {
@@ -87,19 +92,22 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
-				return getRootEntry();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
+			return getRootEntry();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -107,17 +115,18 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
-				return base_Package != null;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
-				return base_Class != null;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
-				return rootEntry != null && !rootEntry.isEmpty();
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
+			return base_Package != null;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
+			return base_Class != null;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
+			return rootEntry != null && !rootEntry.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -125,22 +134,23 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
-				getRootEntry().clear();
-				getRootEntry().addAll((Collection<? extends ConfigurationDecisionModelEntry>)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
+			getRootEntry().clear();
+			getRootEntry().addAll((Collection<? extends ConfigurationDecisionModelEntry>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -148,6 +158,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,14 +169,15 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -175,6 +187,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -184,26 +197,28 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -213,6 +228,7 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -222,32 +238,34 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
-				getRootEntry().clear();
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY:
+			getRootEntry().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -255,10 +273,11 @@ public abstract class ConfigurationDecisionModelImpl extends EAElementImpl imple
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ConfigurationDecisionModelEntry> getRootEntry() {
-		if (rootEntry == null) {
+		if(rootEntry == null) {
 			rootEntry = new EObjectResolvingEList<ConfigurationDecisionModelEntry>(ConfigurationDecisionModelEntry.class, this, VariabilityPackage.CONFIGURATION_DECISION_MODEL__ROOT_ENTRY);
 		}
 		return rootEntry;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ContainerConfigurationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ContainerConfigurationImpl.java
index 1527fe7fbdc..21ece4f166f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ContainerConfigurationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ContainerConfigurationImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl#getConfiguredContainer <em>Configured Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ContainerConfigurationImpl#getConfiguredContainer <em>Configured Container</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl implements ContainerConfiguration {
+
 	/**
 	 * The cached value of the '{@link #getConfiguredContainer() <em>Configured Container</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConfiguredContainer()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ContainerConfigurationImpl() {
@@ -60,6 +63,7 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ConfigurableContainer basicGetConfiguredContainer() {
@@ -69,14 +73,16 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
-				if (resolve) return getConfiguredContainer();
-				return basicGetConfiguredContainer();
+		switch(featureID) {
+		case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
+			if(resolve)
+				return getConfiguredContainer();
+			return basicGetConfiguredContainer();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
-				return configuredContainer != null;
+		switch(featureID) {
+		case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
+			return configuredContainer != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
-				setConfiguredContainer((ConfigurableContainer)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
+			setConfiguredContainer((ConfigurableContainer)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
-				setConfiguredContainer((ConfigurableContainer)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER:
+			setConfiguredContainer((ConfigurableContainer)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ConfigurableContainer getConfiguredContainer() {
-		if (configuredContainer != null && configuredContainer.eIsProxy()) {
+		if(configuredContainer != null && configuredContainer.eIsProxy()) {
 			InternalEObject oldConfiguredContainer = (InternalEObject)configuredContainer;
 			configuredContainer = (ConfigurableContainer)eResolveProxy(oldConfiguredContainer);
-			if (configuredContainer != oldConfiguredContainer) {
-				if (eNotificationRequired())
+			if(configuredContainer != oldConfiguredContainer) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER, oldConfiguredContainer, configuredContainer));
 			}
 		}
@@ -155,12 +166,13 @@ public class ContainerConfigurationImpl extends ConfigurationDecisionModelImpl i
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setConfiguredContainer(ConfigurableContainer newConfiguredContainer) {
 		ConfigurableContainer oldConfiguredContainer = configuredContainer;
 		configuredContainer = newConfiguredContainer;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.CONTAINER_CONFIGURATION__CONFIGURED_CONTAINER, oldConfiguredContainer, configuredContainer));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/FeatureConfigurationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/FeatureConfigurationImpl.java
index 928bd336086..0bd6e086336 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/FeatureConfigurationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/FeatureConfigurationImpl.java
@@ -31,17 +31,19 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl#getConfiguredFeatureModel <em>Configured Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.FeatureConfigurationImpl#getConfiguredFeatureModel <em>Configured Feature Model</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl implements FeatureConfiguration {
+
 	/**
 	 * The cached value of the '{@link #getConfiguredFeatureModel() <em>Configured Feature Model</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConfiguredFeatureModel()
 	 * @generated
 	 * @ordered
@@ -51,6 +53,7 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FeatureConfigurationImpl() {
@@ -60,6 +63,7 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureModel basicGetConfiguredFeatureModel() {
@@ -69,14 +73,16 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
-				if (resolve) return getConfiguredFeatureModel();
-				return basicGetConfiguredFeatureModel();
+		switch(featureID) {
+		case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
+			if(resolve)
+				return getConfiguredFeatureModel();
+			return basicGetConfiguredFeatureModel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -84,13 +90,14 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
-				return configuredFeatureModel != null;
+		switch(featureID) {
+		case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
+			return configuredFeatureModel != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -98,14 +105,15 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
-				setConfiguredFeatureModel((FeatureModel)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
+			setConfiguredFeatureModel((FeatureModel)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -113,6 +121,7 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,14 +132,15 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
-				setConfiguredFeatureModel((FeatureModel)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL:
+			setConfiguredFeatureModel((FeatureModel)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -138,14 +148,15 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FeatureModel getConfiguredFeatureModel() {
-		if (configuredFeatureModel != null && configuredFeatureModel.eIsProxy()) {
+		if(configuredFeatureModel != null && configuredFeatureModel.eIsProxy()) {
 			InternalEObject oldConfiguredFeatureModel = (InternalEObject)configuredFeatureModel;
 			configuredFeatureModel = (FeatureModel)eResolveProxy(oldConfiguredFeatureModel);
-			if (configuredFeatureModel != oldConfiguredFeatureModel) {
-				if (eNotificationRequired())
+			if(configuredFeatureModel != oldConfiguredFeatureModel) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL, oldConfiguredFeatureModel, configuredFeatureModel));
 			}
 		}
@@ -155,12 +166,13 @@ public class FeatureConfigurationImpl extends ConfigurationDecisionModelImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setConfiguredFeatureModel(FeatureModel newConfiguredFeatureModel) {
 		FeatureModel oldConfiguredFeatureModel = configuredFeatureModel;
 		configuredFeatureModel = newConfiguredFeatureModel;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.FEATURE_CONFIGURATION__CONFIGURED_FEATURE_MODEL, oldConfiguredFeatureModel, configuredFeatureModel));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/InternalBindingImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/InternalBindingImpl.java
index 9ccb0f51923..162d300ccec 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/InternalBindingImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/InternalBindingImpl.java
@@ -26,13 +26,15 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class InternalBindingImpl extends ConfigurationDecisionModelImpl implements InternalBinding {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected InternalBindingImpl() {
@@ -42,6 +44,7 @@ public class InternalBindingImpl extends ConfigurationDecisionModelImpl implemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/PrivateContentImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/PrivateContentImpl.java
index 2911f65f028..b72b33d60ec 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/PrivateContentImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/PrivateContentImpl.java
@@ -32,18 +32,20 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl#getPrivateElement <em>Private Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.PrivateContentImpl#getPrivateElement <em>Private Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PrivateContentImpl extends EAElementImpl implements PrivateContent {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	 * The cached value of the '{@link #getPrivateElement() <em>Private Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPrivateElement()
 	 * @generated
 	 * @ordered
@@ -63,6 +66,7 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PrivateContentImpl() {
@@ -72,6 +76,7 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetPrivateElement() {
@@ -81,17 +86,20 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
-				if (resolve) return getPrivateElement();
-				return basicGetPrivateElement();
+		switch(featureID) {
+		case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
+			if(resolve)
+				return getPrivateElement();
+			return basicGetPrivateElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -99,15 +107,16 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
-				return base_Class != null;
-			case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
-				return privateElement != null;
+		switch(featureID) {
+		case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
+			return base_Class != null;
+		case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
+			return privateElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -115,17 +124,18 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
-				setPrivateElement((NamedElement)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
+			setPrivateElement((NamedElement)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -133,6 +143,7 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,14 +154,15 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -160,6 +172,7 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -169,29 +182,31 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
-				setPrivateElement((NamedElement)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.PRIVATE_CONTENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT:
+			setPrivateElement((NamedElement)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -199,14 +214,15 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getPrivateElement() {
-		if (privateElement != null && privateElement.eIsProxy()) {
+		if(privateElement != null && privateElement.eIsProxy()) {
 			InternalEObject oldPrivateElement = (InternalEObject)privateElement;
 			privateElement = (NamedElement)eResolveProxy(oldPrivateElement);
-			if (privateElement != oldPrivateElement) {
-				if (eNotificationRequired())
+			if(privateElement != oldPrivateElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT, oldPrivateElement, privateElement));
 			}
 		}
@@ -216,12 +232,13 @@ public class PrivateContentImpl extends EAElementImpl implements PrivateContent
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPrivateElement(NamedElement newPrivateElement) {
 		NamedElement oldPrivateElement = privateElement;
 		privateElement = newPrivateElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.PRIVATE_CONTENT__PRIVATE_ELEMENT, oldPrivateElement, privateElement));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ReuseMetaInformationImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ReuseMetaInformationImpl.java
index 1e0c2068c38..e5b32b9e612 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ReuseMetaInformationImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/ReuseMetaInformationImpl.java
@@ -25,17 +25,16 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
 

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Reuse Meta Information</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Reuse Meta Information</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#getInformation <em>Information</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#isIsReusable <em>Is Reusable</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#getInformation <em>Information</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#isIsReusable <em>Is Reusable</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.ReuseMetaInformationImpl#getBase_Class <em>Base Class</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class ReuseMetaInformationImpl extends TraceableSpecificationImpl implements ReuseMetaInformation {

@@ -84,6 +83,7 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -92,6 +92,7 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ReuseMetaInformationImpl() {

@@ -100,61 +101,66 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

-				return getInformation();

-			case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

-				return isIsReusable();

-			case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

-				if (resolve) return getBase_Class();

-				return basicGetBase_Class();

+		switch(featureID) {

+		case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

+			return getInformation();

+		case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

+			return isIsReusable();

+		case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

+			if(resolve)

+				return getBase_Class();

+			return basicGetBase_Class();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

-				return INFORMATION_EDEFAULT == null ? information != null : !INFORMATION_EDEFAULT.equals(information);

-			case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

-				return isReusable != IS_REUSABLE_EDEFAULT;

-			case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

-				return base_Class != null;

+		switch(featureID) {

+		case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

+			return INFORMATION_EDEFAULT == null ? information != null : !INFORMATION_EDEFAULT.equals(information);

+		case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

+			return isReusable != IS_REUSABLE_EDEFAULT;

+		case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

+			return base_Class != null;

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

-				setInformation((String)newValue);

-				return;

-			case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

-				setIsReusable((Boolean)newValue);

-				return;

-			case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);

-				return;

+		switch(featureID) {

+		case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

+			setInformation((String)newValue);

+			return;

+		case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

+			setIsReusable((Boolean)newValue);

+			return;

+		case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -164,26 +170,28 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

-				setInformation(INFORMATION_EDEFAULT);

-				return;

-			case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

-				setIsReusable(IS_REUSABLE_EDEFAULT);

-				return;

-			case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)null);

-				return;

+		switch(featureID) {

+		case VariabilityPackage.REUSE_META_INFORMATION__INFORMATION:

+			setInformation(INFORMATION_EDEFAULT);

+			return;

+		case VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE:

+			setIsReusable(IS_REUSABLE_EDEFAULT);

+			return;

+		case VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getInformation() {

@@ -192,6 +200,7 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public boolean isIsReusable() {

@@ -200,37 +209,40 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setInformation(String newInformation) {

 		String oldInformation = information;

 		information = newInformation;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.REUSE_META_INFORMATION__INFORMATION, oldInformation, information));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setIsReusable(boolean newIsReusable) {

 		boolean oldIsReusable = isReusable;

 		isReusable = newIsReusable;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.REUSE_META_INFORMATION__IS_REUSABLE, oldIsReusable, isReusable));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if (base_Class != null && base_Class.eIsProxy()) {

+		if(base_Class != null && base_Class.eIsProxy()) {

 			InternalEObject oldBase_Class = (InternalEObject)base_Class;

 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if (base_Class != oldBase_Class) {

-				if (eNotificationRequired())

+			if(base_Class != oldBase_Class) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS, oldBase_Class, base_Class));

 			}

 		}

@@ -240,6 +252,7 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -249,22 +262,25 @@ public class ReuseMetaInformationImpl extends TraceableSpecificationImpl impleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.REUSE_META_INFORMATION__BASE_CLASS, oldBase_Class, base_Class));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (information: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/SelectionCriterionImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/SelectionCriterionImpl.java
index bd1c3231111..c3f6bf9d34c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/SelectionCriterionImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/SelectionCriterionImpl.java
@@ -36,18 +36,20 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.SelectionCriterionImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SelectionCriterionImpl extends EAElementImpl implements SelectionCriterion {
+
 	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -58,6 +60,7 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SelectionCriterionImpl() {
@@ -76,16 +80,18 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.SELECTION_CRITERION__SOURCE:
-				return getSource();
-			case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case VariabilityPackage.SELECTION_CRITERION__SOURCE:
+			return getSource();
+		case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -93,15 +99,16 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.SELECTION_CRITERION__SOURCE:
-				return source != null && !source.isEmpty();
-			case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case VariabilityPackage.SELECTION_CRITERION__SOURCE:
+			return source != null && !source.isEmpty();
+		case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -109,19 +116,20 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.SELECTION_CRITERION__SOURCE:
-				getSource().clear();
-				getSource().addAll((Collection<? extends NamedElement>)newValue);
-				return;
-			case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.SELECTION_CRITERION__SOURCE:
+			getSource().clear();
+			getSource().addAll((Collection<? extends NamedElement>)newValue);
+			return;
+		case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -129,6 +137,7 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,17 +148,18 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.SELECTION_CRITERION__SOURCE:
-				getSource().clear();
-				return;
-			case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.SELECTION_CRITERION__SOURCE:
+			getSource().clear();
+			return;
+		case VariabilityPackage.SELECTION_CRITERION__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -157,10 +167,11 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedElement> getSource() {
-		if (source == null) {
+		if(source == null) {
 			source = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, VariabilityPackage.SELECTION_CRITERION__SOURCE);
 		}
 		return source;
@@ -169,14 +180,15 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.SELECTION_CRITERION__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -186,6 +198,7 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -195,12 +208,13 @@ public class SelectionCriterionImpl extends EAElementImpl implements SelectionCr
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.SELECTION_CRITERION__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityFactoryImpl.java
index a6fd950710f..8f9d5ab4083 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityFactoryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.eastadl.variability.*;

 import org.eclipse.papyrus.eastadl.variability.ConfigurableContainer;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecision;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder;

@@ -39,12 +40,14 @@ import org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityFactory {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -56,16 +59,16 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static VariabilityFactory init() {

 		try {

 			VariabilityFactory theVariabilityFactory = (VariabilityFactory)EPackage.Registry.INSTANCE.getEFactory(VariabilityPackage.eNS_URI);

-			if (theVariabilityFactory != null) {

+			if(theVariabilityFactory != null) {

 				return theVariabilityFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new VariabilityFactoryImpl();

@@ -74,6 +77,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityFactoryImpl() {

@@ -82,32 +86,47 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case VariabilityPackage.VARIATION_GROUP: return createVariationGroup();

-			case VariabilityPackage.VARIABLE_ELEMENT: return createVariableElement();

-			case VariabilityPackage.REUSE_META_INFORMATION: return createReuseMetaInformation();

-			case VariabilityPackage.CONFIGURABLE_CONTAINER: return createConfigurableContainer();

-			case VariabilityPackage.INTERNAL_BINDING: return createInternalBinding();

-			case VariabilityPackage.VARIABILITY: return createVariability();

-			case VariabilityPackage.FEATURE_CONFIGURATION: return createFeatureConfiguration();

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING: return createVehicleLevelBinding();

-			case VariabilityPackage.CONFIGURATION_DECISION: return createConfigurationDecision();

-			case VariabilityPackage.SELECTION_CRITERION: return createSelectionCriterion();

-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER: return createConfigurationDecisionFolder();

-			case VariabilityPackage.CONTAINER_CONFIGURATION: return createContainerConfiguration();

-			case VariabilityPackage.PRIVATE_CONTENT: return createPrivateContent();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch(eClass.getClassifierID()) {

+		case VariabilityPackage.VARIATION_GROUP:

+			return createVariationGroup();

+		case VariabilityPackage.VARIABLE_ELEMENT:

+			return createVariableElement();

+		case VariabilityPackage.REUSE_META_INFORMATION:

+			return createReuseMetaInformation();

+		case VariabilityPackage.CONFIGURABLE_CONTAINER:

+			return createConfigurableContainer();

+		case VariabilityPackage.INTERNAL_BINDING:

+			return createInternalBinding();

+		case VariabilityPackage.VARIABILITY:

+			return createVariability();

+		case VariabilityPackage.FEATURE_CONFIGURATION:

+			return createFeatureConfiguration();

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING:

+			return createVehicleLevelBinding();

+		case VariabilityPackage.CONFIGURATION_DECISION:

+			return createConfigurationDecision();

+		case VariabilityPackage.SELECTION_CRITERION:

+			return createSelectionCriterion();

+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER:

+			return createConfigurationDecisionFolder();

+		case VariabilityPackage.CONTAINER_CONFIGURATION:

+			return createContainerConfiguration();

+		case VariabilityPackage.PRIVATE_CONTENT:

+			return createPrivateContent();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ConfigurableContainer createConfigurableContainer() {

@@ -118,6 +137,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ConfigurationDecision createConfigurationDecision() {

@@ -128,6 +148,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ConfigurationDecisionFolder createConfigurationDecisionFolder() {

@@ -138,6 +159,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ContainerConfiguration createContainerConfiguration() {

@@ -148,6 +170,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public FeatureConfiguration createFeatureConfiguration() {

@@ -158,6 +181,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VehicleLevelBinding createVehicleLevelBinding() {

@@ -168,6 +192,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public InternalBinding createInternalBinding() {

@@ -178,6 +203,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public PrivateContent createPrivateContent() {

@@ -187,6 +213,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ReuseMetaInformation createReuseMetaInformation() {

@@ -197,6 +224,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public SelectionCriterion createSelectionCriterion() {

@@ -207,6 +235,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Variability createVariability() {

@@ -217,6 +246,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariableElement createVariableElement() {

@@ -226,6 +256,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariationGroup createVariationGroup() {

@@ -235,6 +266,7 @@ public class VariabilityFactoryImpl extends EFactoryImpl implements VariabilityF
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityPackage getVariabilityPackage() {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityImpl.java
index 22662a8065b..5af6b87c58f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityImpl.java
@@ -40,23 +40,25 @@ import org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getBase_Class <em>Base Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getConfigurableContainer <em>Configurable Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getConfiguration <em>Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getProductFeatureModel <em>Product Feature Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getDecisionModel <em>Decision Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getVariableElement <em>Variable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getBase_Package <em>Base Package</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getConfigurableContainer <em>Configurable Container</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getConfiguration <em>Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getProductFeatureModel <em>Product Feature Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getDecisionModel <em>Decision Model</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariabilityImpl#getVariableElement <em>Variable Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VariabilityImpl extends ContextImpl implements Variability {
+
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Package()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getConfigurableContainer() <em>Configurable Container</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConfigurableContainer()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getConfiguration()
 	 * @generated
 	 * @ordered
@@ -97,6 +102,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getProductFeatureModel() <em>Product Feature Model</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProductFeatureModel()
 	 * @generated
 	 * @ordered
@@ -107,6 +113,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getDecisionModel() <em>Decision Model</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDecisionModel()
 	 * @generated
 	 * @ordered
@@ -117,6 +124,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	 * The cached value of the '{@link #getVariableElement() <em>Variable Element</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVariableElement()
 	 * @generated
 	 * @ordered
@@ -126,6 +134,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VariabilityImpl() {
@@ -135,27 +144,30 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABILITY__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
-			case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
-				return getConfigurableContainer();
-			case VariabilityPackage.VARIABILITY__CONFIGURATION:
-				return getConfiguration();
-			case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
-				return getProductFeatureModel();
-			case VariabilityPackage.VARIABILITY__DECISION_MODEL:
-				return getDecisionModel();
-			case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
-				return getVariableElement();
+		switch(featureID) {
+		case VariabilityPackage.VARIABILITY__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
+		case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
+			if(resolve)
+				return getBase_Package();
+			return basicGetBase_Package();
+		case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
+			return getConfigurableContainer();
+		case VariabilityPackage.VARIABILITY__CONFIGURATION:
+			return getConfiguration();
+		case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
+			return getProductFeatureModel();
+		case VariabilityPackage.VARIABILITY__DECISION_MODEL:
+			return getDecisionModel();
+		case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
+			return getVariableElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -163,25 +175,26 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABILITY__BASE_CLASS:
-				return base_Class != null;
-			case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
-				return base_Package != null;
-			case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
-				return configurableContainer != null && !configurableContainer.isEmpty();
-			case VariabilityPackage.VARIABILITY__CONFIGURATION:
-				return configuration != null && !configuration.isEmpty();
-			case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
-				return productFeatureModel != null && !productFeatureModel.isEmpty();
-			case VariabilityPackage.VARIABILITY__DECISION_MODEL:
-				return decisionModel != null && !decisionModel.isEmpty();
-			case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
-				return variableElement != null && !variableElement.isEmpty();
+		switch(featureID) {
+		case VariabilityPackage.VARIABILITY__BASE_CLASS:
+			return base_Class != null;
+		case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
+			return base_Package != null;
+		case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
+			return configurableContainer != null && !configurableContainer.isEmpty();
+		case VariabilityPackage.VARIABILITY__CONFIGURATION:
+			return configuration != null && !configuration.isEmpty();
+		case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
+			return productFeatureModel != null && !productFeatureModel.isEmpty();
+		case VariabilityPackage.VARIABILITY__DECISION_MODEL:
+			return decisionModel != null && !decisionModel.isEmpty();
+		case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
+			return variableElement != null && !variableElement.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -189,38 +202,39 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABILITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
-				getConfigurableContainer().clear();
-				getConfigurableContainer().addAll((Collection<? extends ConfigurableContainer>)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__CONFIGURATION:
-				getConfiguration().clear();
-				getConfiguration().addAll((Collection<? extends FeatureConfiguration>)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
-				getProductFeatureModel().clear();
-				getProductFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__DECISION_MODEL:
-				getDecisionModel().clear();
-				getDecisionModel().addAll((Collection<? extends VehicleLevelBinding>)newValue);
-				return;
-			case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
-				getVariableElement().clear();
-				getVariableElement().addAll((Collection<? extends VariableElement>)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.VARIABILITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
+			getConfigurableContainer().clear();
+			getConfigurableContainer().addAll((Collection<? extends ConfigurableContainer>)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__CONFIGURATION:
+			getConfiguration().clear();
+			getConfiguration().addAll((Collection<? extends FeatureConfiguration>)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
+			getProductFeatureModel().clear();
+			getProductFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__DECISION_MODEL:
+			getDecisionModel().clear();
+			getDecisionModel().addAll((Collection<? extends VehicleLevelBinding>)newValue);
+			return;
+		case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
+			getVariableElement().clear();
+			getVariableElement().addAll((Collection<? extends VariableElement>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -228,6 +242,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,14 +253,15 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABILITY__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -255,6 +271,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -264,26 +281,28 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABILITY__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
+		if(base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject)base_Package;
 			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
+			if(base_Package != oldBase_Package) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABILITY__BASE_PACKAGE, oldBase_Package, base_Package));
 			}
 		}
@@ -293,6 +312,7 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
@@ -302,44 +322,46 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
 		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
 		base_Package = newBase_Package;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABILITY__BASE_PACKAGE, oldBase_Package, base_Package));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABILITY__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
-			case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
-				getConfigurableContainer().clear();
-				return;
-			case VariabilityPackage.VARIABILITY__CONFIGURATION:
-				getConfiguration().clear();
-				return;
-			case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
-				getProductFeatureModel().clear();
-				return;
-			case VariabilityPackage.VARIABILITY__DECISION_MODEL:
-				getDecisionModel().clear();
-				return;
-			case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
-				getVariableElement().clear();
-				return;
+		switch(featureID) {
+		case VariabilityPackage.VARIABILITY__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
+		case VariabilityPackage.VARIABILITY__BASE_PACKAGE:
+			setBase_Package((org.eclipse.uml2.uml.Package)null);
+			return;
+		case VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER:
+			getConfigurableContainer().clear();
+			return;
+		case VariabilityPackage.VARIABILITY__CONFIGURATION:
+			getConfiguration().clear();
+			return;
+		case VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL:
+			getProductFeatureModel().clear();
+			return;
+		case VariabilityPackage.VARIABILITY__DECISION_MODEL:
+			getDecisionModel().clear();
+			return;
+		case VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT:
+			getVariableElement().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -347,10 +369,11 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ConfigurableContainer> getConfigurableContainer() {
-		if (configurableContainer == null) {
+		if(configurableContainer == null) {
 			configurableContainer = new EObjectResolvingEList<ConfigurableContainer>(ConfigurableContainer.class, this, VariabilityPackage.VARIABILITY__CONFIGURABLE_CONTAINER);
 		}
 		return configurableContainer;
@@ -359,10 +382,11 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FeatureConfiguration> getConfiguration() {
-		if (configuration == null) {
+		if(configuration == null) {
 			configuration = new EObjectResolvingEList<FeatureConfiguration>(FeatureConfiguration.class, this, VariabilityPackage.VARIABILITY__CONFIGURATION);
 		}
 		return configuration;
@@ -371,10 +395,11 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VehicleLevelBinding> getDecisionModel() {
-		if (decisionModel == null) {
+		if(decisionModel == null) {
 			decisionModel = new EObjectResolvingEList<VehicleLevelBinding>(VehicleLevelBinding.class, this, VariabilityPackage.VARIABILITY__DECISION_MODEL);
 		}
 		return decisionModel;
@@ -383,10 +408,11 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FeatureModel> getProductFeatureModel() {
-		if (productFeatureModel == null) {
+		if(productFeatureModel == null) {
 			productFeatureModel = new EObjectResolvingEList<FeatureModel>(FeatureModel.class, this, VariabilityPackage.VARIABILITY__PRODUCT_FEATURE_MODEL);
 		}
 		return productFeatureModel;
@@ -395,10 +421,11 @@ public class VariabilityImpl extends ContextImpl implements Variability {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<VariableElement> getVariableElement() {
-		if (variableElement == null) {
+		if(variableElement == null) {
 			variableElement = new EObjectResolvingEList<VariableElement>(VariableElement.class, this, VariabilityPackage.VARIABILITY__VARIABLE_ELEMENT);
 		}
 		return variableElement;
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityPackageImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityPackageImpl.java
index 26490d0c826..cae634be3a9 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityPackageImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariabilityPackageImpl.java
@@ -98,12 +98,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VariabilityPackageImpl extends EPackageImpl implements VariabilityPackage {

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -111,16 +113,18 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * 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 VariabilityPackage#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 --> <!-- end-user-doc -->

+	 * <p>

+	 * This method is used to initialize {@link VariabilityPackage#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 --> <!-- end-user-doc -->

+	 * 

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static VariabilityPackage init() {

-		if (isInited) return (VariabilityPackage)EPackage.Registry.INSTANCE.getEPackage(VariabilityPackage.eNS_URI);

+		if(isInited)

+			return (VariabilityPackage)EPackage.Registry.INSTANCE.getEPackage(VariabilityPackage.eNS_URI);

 

 		// Obtain or create and register package

 		VariabilityPackageImpl theVariabilityPackage = (VariabilityPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VariabilityPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VariabilityPackageImpl());

@@ -222,7 +226,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 		// Mark meta-data to indicate it can't be changed

 		theVariabilityPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(VariabilityPackage.eNS_URI, theVariabilityPackage);

 		return theVariabilityPackage;

@@ -230,12 +234,14 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass variationGroupEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass reuseMetaInformationEClass = null;

@@ -243,6 +249,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass variabilityEClass = null;

@@ -250,6 +257,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass featureConfigurationEClass = null;

@@ -257,6 +265,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass vehicleLevelBindingEClass = null;

@@ -264,6 +273,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass configurationDecisionEClass = null;

@@ -271,6 +281,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass selectionCriterionEClass = null;

@@ -278,6 +289,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass configurationDecisionFolderEClass = null;

@@ -285,6 +297,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass containerConfigurationEClass = null;

@@ -292,6 +305,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass privateContentEClass = null;

@@ -299,6 +313,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass configurableContainerEClass = null;

@@ -306,6 +321,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass internalBindingEClass = null;

@@ -313,6 +329,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass configurationDecisionModelEClass = null;

@@ -320,6 +337,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass configurationDecisionModelEntryEClass = null;

@@ -327,31 +345,33 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass variableElementEClass = null;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

+	 * package

 	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage#eNS_URI

 	 * @see #init()

@@ -362,13 +382,15 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	}

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

+	 * Creates the meta-model objects for the package. This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if(isCreated)

+			return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -450,6 +472,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getConfigurableContainer() {

@@ -459,6 +482,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_ConfigurableElement() {

@@ -468,6 +492,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_InternalBinding() {

@@ -477,6 +502,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_PublicFeatureModel() {

@@ -486,6 +512,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_VariationGroup() {

@@ -495,6 +522,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_Base_Class() {

@@ -504,6 +532,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurableContainer_Base_Package() {

@@ -513,6 +542,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getConfigurationDecision() {

@@ -522,6 +552,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getConfigurationDecision_Criterion() {

@@ -531,6 +562,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getConfigurationDecision_Effect() {

@@ -540,6 +572,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getConfigurationDecision_IsEquivalence() {

@@ -549,6 +582,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecision_SelectionCriterion() {

@@ -558,6 +592,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecision_Target() {

@@ -567,6 +602,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getConfigurationDecisionFolder() {

@@ -576,6 +612,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecisionFolder_ChildEntry() {

@@ -585,6 +622,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getConfigurationDecisionModel() {

@@ -594,6 +632,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecisionModel_Base_Package() {

@@ -603,6 +642,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecisionModel_Base_Class() {

@@ -612,6 +652,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecisionModel_RootEntry() {

@@ -621,6 +662,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getConfigurationDecisionModelEntry() {

@@ -630,6 +672,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getConfigurationDecisionModelEntry_IsActive() {

@@ -639,6 +682,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getConfigurationDecisionModelEntry_Base_Class() {

@@ -648,6 +692,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getContainerConfiguration() {

@@ -657,6 +702,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getContainerConfiguration_ConfiguredContainer() {

@@ -666,6 +712,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getFeatureConfiguration() {

@@ -675,6 +722,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getFeatureConfiguration_ConfiguredFeatureModel() {

@@ -684,6 +732,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getVehicleLevelBinding() {

@@ -693,6 +742,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVehicleLevelBinding_SourceVehicleFeatureModel() {

@@ -702,6 +752,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVehicleLevelBinding_TargetFeatureModel() {

@@ -711,6 +762,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getInternalBinding() {

@@ -720,6 +772,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getPrivateContent() {

@@ -729,6 +782,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPrivateContent_Base_Class() {

@@ -738,6 +792,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getPrivateContent_PrivateElement() {

@@ -746,6 +801,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getReuseMetaInformation() {

@@ -754,6 +810,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getReuseMetaInformation_Information() {

@@ -762,6 +819,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getReuseMetaInformation_IsReusable() {

@@ -771,6 +829,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getReuseMetaInformation_Base_Class() {

@@ -780,6 +839,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getSelectionCriterion() {

@@ -789,6 +849,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSelectionCriterion_Source() {

@@ -798,6 +859,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getSelectionCriterion_Base_Class() {

@@ -807,6 +869,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getVariability() {

@@ -816,6 +879,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_Base_Class() {

@@ -825,6 +889,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_Base_Package() {

@@ -834,6 +899,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_ConfigurableContainer() {

@@ -843,6 +909,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_Configuration() {

@@ -852,6 +919,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_DecisionModel() {

@@ -861,6 +929,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_ProductFeatureModel() {

@@ -870,6 +939,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariability_VariableElement() {

@@ -878,6 +948,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityFactory getVariabilityFactory() {

@@ -887,6 +958,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getVariableElement() {

@@ -896,6 +968,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariableElement_ActualBindingTime() {

@@ -905,6 +978,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariableElement_OptionalElement() {

@@ -914,6 +988,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariableElement_Base_Class() {

@@ -923,6 +998,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariableElement_RequiredBindingTime() {

@@ -932,6 +1008,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariableElement_ReuseMetaInformation() {

@@ -940,6 +1017,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getVariationGroup() {

@@ -948,6 +1026,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getVariationGroup_Constraint() {

@@ -956,6 +1035,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EAttribute getVariationGroup_Kind() {

@@ -965,6 +1045,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariationGroup_Base_Class() {

@@ -973,6 +1054,7 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getVariationGroup_VariableElement() {

@@ -980,13 +1062,15 @@ public class VariabilityPackageImpl extends EPackageImpl implements VariabilityP
 	}

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

+	 * Complete the initialization of the package and its meta-model. This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if(isInitialized)

+			return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariableElementImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariableElementImpl.java
index 797715ccaa2..b2b91a1fd7a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariableElementImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariableElementImpl.java
@@ -34,21 +34,23 @@ import org.eclipse.uml2.uml.NamedElement;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getRequiredBindingTime <em>Required Binding Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getActualBindingTime <em>Actual Binding Time</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getReuseMetaInformation <em>Reuse Meta Information</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getOptionalElement <em>Optional Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getBase_Class <em>Base Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getRequiredBindingTime <em>Required Binding Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getActualBindingTime <em>Actual Binding Time</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getReuseMetaInformation <em>Reuse Meta Information</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getOptionalElement <em>Optional Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariableElementImpl#getBase_Class <em>Base Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class VariableElementImpl extends EAElementImpl implements VariableElement {
+
 	/**
 	 * The cached value of the '{@link #getRequiredBindingTime() <em>Required Binding Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getRequiredBindingTime()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	 * The cached value of the '{@link #getActualBindingTime() <em>Actual Binding Time</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getActualBindingTime()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	 * The cached value of the '{@link #getReuseMetaInformation() <em>Reuse Meta Information</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getReuseMetaInformation()
 	 * @generated
 	 * @ordered
@@ -79,6 +83,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	 * The cached value of the '{@link #getOptionalElement() <em>Optional Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOptionalElement()
 	 * @generated
 	 * @ordered
@@ -89,6 +94,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBase_Class()
 	 * @generated
 	 * @ordered
@@ -98,6 +104,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VariableElementImpl() {
@@ -107,6 +114,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingTime basicGetActualBindingTime() {
@@ -116,6 +124,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement basicGetOptionalElement() {
@@ -125,6 +134,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingTime basicGetRequiredBindingTime() {
@@ -134,6 +144,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReuseMetaInformation basicGetReuseMetaInformation() {
@@ -143,26 +154,32 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
-				if (resolve) return getRequiredBindingTime();
-				return basicGetRequiredBindingTime();
-			case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
-				if (resolve) return getActualBindingTime();
-				return basicGetActualBindingTime();
-			case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
-				if (resolve) return getReuseMetaInformation();
-				return basicGetReuseMetaInformation();
-			case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
-				if (resolve) return getOptionalElement();
-				return basicGetOptionalElement();
-			case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
-				if (resolve) return getBase_Class();
-				return basicGetBase_Class();
+		switch(featureID) {
+		case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
+			if(resolve)
+				return getRequiredBindingTime();
+			return basicGetRequiredBindingTime();
+		case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
+			if(resolve)
+				return getActualBindingTime();
+			return basicGetActualBindingTime();
+		case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
+			if(resolve)
+				return getReuseMetaInformation();
+			return basicGetReuseMetaInformation();
+		case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
+			if(resolve)
+				return getOptionalElement();
+			return basicGetOptionalElement();
+		case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
+			if(resolve)
+				return getBase_Class();
+			return basicGetBase_Class();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -170,21 +187,22 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
-				return requiredBindingTime != null;
-			case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
-				return actualBindingTime != null;
-			case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
-				return reuseMetaInformation != null;
-			case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
-				return optionalElement != null;
-			case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
-				return base_Class != null;
+		switch(featureID) {
+		case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
+			return requiredBindingTime != null;
+		case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
+			return actualBindingTime != null;
+		case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
+			return reuseMetaInformation != null;
+		case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
+			return optionalElement != null;
+		case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
+			return base_Class != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -192,27 +210,28 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
-				setRequiredBindingTime((BindingTime)newValue);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
-				setActualBindingTime((BindingTime)newValue);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
-				setReuseMetaInformation((ReuseMetaInformation)newValue);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
-				setOptionalElement((NamedElement)newValue);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
+			setRequiredBindingTime((BindingTime)newValue);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
+			setActualBindingTime((BindingTime)newValue);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
+			setReuseMetaInformation((ReuseMetaInformation)newValue);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
+			setOptionalElement((NamedElement)newValue);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -220,6 +239,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -230,26 +250,27 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
-				setRequiredBindingTime((BindingTime)null);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
-				setActualBindingTime((BindingTime)null);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
-				setReuseMetaInformation((ReuseMetaInformation)null);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
-				setOptionalElement((NamedElement)null);
-				return;
-			case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
-				setBase_Class((org.eclipse.uml2.uml.Class)null);
-				return;
+		switch(featureID) {
+		case VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME:
+			setRequiredBindingTime((BindingTime)null);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME:
+			setActualBindingTime((BindingTime)null);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION:
+			setReuseMetaInformation((ReuseMetaInformation)null);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT:
+			setOptionalElement((NamedElement)null);
+			return;
+		case VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS:
+			setBase_Class((org.eclipse.uml2.uml.Class)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -257,14 +278,15 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingTime getActualBindingTime() {
-		if (actualBindingTime != null && actualBindingTime.eIsProxy()) {
+		if(actualBindingTime != null && actualBindingTime.eIsProxy()) {
 			InternalEObject oldActualBindingTime = (InternalEObject)actualBindingTime;
 			actualBindingTime = (BindingTime)eResolveProxy(oldActualBindingTime);
-			if (actualBindingTime != oldActualBindingTime) {
-				if (eNotificationRequired())
+			if(actualBindingTime != oldActualBindingTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME, oldActualBindingTime, actualBindingTime));
 			}
 		}
@@ -274,14 +296,15 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElement getOptionalElement() {
-		if (optionalElement != null && optionalElement.eIsProxy()) {
+		if(optionalElement != null && optionalElement.eIsProxy()) {
 			InternalEObject oldOptionalElement = (InternalEObject)optionalElement;
 			optionalElement = (NamedElement)eResolveProxy(oldOptionalElement);
-			if (optionalElement != oldOptionalElement) {
-				if (eNotificationRequired())
+			if(optionalElement != oldOptionalElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT, oldOptionalElement, optionalElement));
 			}
 		}
@@ -291,14 +314,15 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingTime getRequiredBindingTime() {
-		if (requiredBindingTime != null && requiredBindingTime.eIsProxy()) {
+		if(requiredBindingTime != null && requiredBindingTime.eIsProxy()) {
 			InternalEObject oldRequiredBindingTime = (InternalEObject)requiredBindingTime;
 			requiredBindingTime = (BindingTime)eResolveProxy(oldRequiredBindingTime);
-			if (requiredBindingTime != oldRequiredBindingTime) {
-				if (eNotificationRequired())
+			if(requiredBindingTime != oldRequiredBindingTime) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME, oldRequiredBindingTime, requiredBindingTime));
 			}
 		}
@@ -308,14 +332,15 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ReuseMetaInformation getReuseMetaInformation() {
-		if (reuseMetaInformation != null && reuseMetaInformation.eIsProxy()) {
+		if(reuseMetaInformation != null && reuseMetaInformation.eIsProxy()) {
 			InternalEObject oldReuseMetaInformation = (InternalEObject)reuseMetaInformation;
 			reuseMetaInformation = (ReuseMetaInformation)eResolveProxy(oldReuseMetaInformation);
-			if (reuseMetaInformation != oldReuseMetaInformation) {
-				if (eNotificationRequired())
+			if(reuseMetaInformation != oldReuseMetaInformation) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION, oldReuseMetaInformation, reuseMetaInformation));
 			}
 		}
@@ -325,38 +350,41 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setActualBindingTime(BindingTime newActualBindingTime) {
 		BindingTime oldActualBindingTime = actualBindingTime;
 		actualBindingTime = newActualBindingTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABLE_ELEMENT__ACTUAL_BINDING_TIME, oldActualBindingTime, actualBindingTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOptionalElement(NamedElement newOptionalElement) {
 		NamedElement oldOptionalElement = optionalElement;
 		optionalElement = newOptionalElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABLE_ELEMENT__OPTIONAL_ELEMENT, oldOptionalElement, optionalElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class getBase_Class() {
-		if (base_Class != null && base_Class.eIsProxy()) {
+		if(base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
-			if (base_Class != oldBase_Class) {
-				if (eNotificationRequired())
+			if(base_Class != oldBase_Class) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS, oldBase_Class, base_Class));
 			}
 		}
@@ -366,6 +394,7 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
@@ -375,36 +404,39 @@ public class VariableElementImpl extends EAElementImpl implements VariableElemen
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABLE_ELEMENT__BASE_CLASS, oldBase_Class, base_Class));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRequiredBindingTime(BindingTime newRequiredBindingTime) {
 		BindingTime oldRequiredBindingTime = requiredBindingTime;
 		requiredBindingTime = newRequiredBindingTime;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABLE_ELEMENT__REQUIRED_BINDING_TIME, oldRequiredBindingTime, requiredBindingTime));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setReuseMetaInformation(ReuseMetaInformation newReuseMetaInformation) {
 		ReuseMetaInformation oldReuseMetaInformation = reuseMetaInformation;
 		reuseMetaInformation = newReuseMetaInformation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIABLE_ELEMENT__REUSE_META_INFORMATION, oldReuseMetaInformation, reuseMetaInformation));
 	}
 
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariationGroupImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariationGroupImpl.java
index 7049101e06e..ed2b70f5fcf 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariationGroupImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VariationGroupImpl.java
@@ -36,13 +36,13 @@ import org.eclipse.papyrus.eastadl.variability.VariationGroup;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getConstraint <em>Constraint</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getKind <em>Kind</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getVariableElement <em>Variable Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getConstraint <em>Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getKind <em>Kind</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VariationGroupImpl#getVariableElement <em>Variable Element</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class VariationGroupImpl extends EAElementImpl implements VariationGroup {

@@ -71,6 +71,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc

 	 * --> <!-- end-user-doc -->

+	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -81,6 +82,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -91,6 +93,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getBase_Class()

 	 * @generated

 	 * @ordered

@@ -100,6 +103,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	/**

 	 * The cached value of the '{@link #getVariableElement() <em>Variable Element</em>}' reference list.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see #getVariableElement()

 	 * @generated

 	 * @ordered

@@ -108,6 +112,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected VariationGroupImpl() {

@@ -116,70 +121,75 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

-				return getConstraint();

-			case VariabilityPackage.VARIATION_GROUP__KIND:

-				return getKind();

-			case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

-				if (resolve) return getBase_Class();

-				return basicGetBase_Class();

-			case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

-				return getVariableElement();

+		switch(featureID) {

+		case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

+			return getConstraint();

+		case VariabilityPackage.VARIATION_GROUP__KIND:

+			return getKind();

+		case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

+			if(resolve)

+				return getBase_Class();

+			return basicGetBase_Class();

+		case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

+			return getVariableElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

-				return CONSTRAINT_EDEFAULT == null ? constraint != null : !CONSTRAINT_EDEFAULT.equals(constraint);

-			case VariabilityPackage.VARIATION_GROUP__KIND:

-				return kind != KIND_EDEFAULT;

-			case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

-				return base_Class != null;

-			case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

-				return variableElement != null && !variableElement.isEmpty();

+		switch(featureID) {

+		case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

+			return CONSTRAINT_EDEFAULT == null ? constraint != null : !CONSTRAINT_EDEFAULT.equals(constraint);

+		case VariabilityPackage.VARIATION_GROUP__KIND:

+			return kind != KIND_EDEFAULT;

+		case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

+			return base_Class != null;

+		case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

+			return variableElement != null && !variableElement.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

-				setConstraint((String)newValue);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__KIND:

-				setKind((VariabilityDependencyKind)newValue);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)newValue);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

-				getVariableElement().clear();

-				getVariableElement().addAll((Collection<? extends VariableElement>)newValue);

-				return;

+		switch(featureID) {

+		case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

+			setConstraint((String)newValue);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__KIND:

+			setKind((VariabilityDependencyKind)newValue);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)newValue);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

+			getVariableElement().clear();

+			getVariableElement().addAll((Collection<? extends VariableElement>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -189,29 +199,31 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

-				setConstraint(CONSTRAINT_EDEFAULT);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__KIND:

-				setKind(KIND_EDEFAULT);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

-				setBase_Class((org.eclipse.uml2.uml.Class)null);

-				return;

-			case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

-				getVariableElement().clear();

-				return;

+		switch(featureID) {

+		case VariabilityPackage.VARIATION_GROUP__CONSTRAINT:

+			setConstraint(CONSTRAINT_EDEFAULT);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__KIND:

+			setKind(KIND_EDEFAULT);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__BASE_CLASS:

+			setBase_Class((org.eclipse.uml2.uml.Class)null);

+			return;

+		case VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT:

+			getVariableElement().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public String getConstraint() {

@@ -220,6 +232,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityDependencyKind getKind() {

@@ -228,10 +241,11 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<VariableElement> getVariableElement() {

-		if (variableElement == null) {

+		if(variableElement == null) {

 			variableElement = new EObjectResolvingEList<VariableElement>(VariableElement.class, this, VariabilityPackage.VARIATION_GROUP__VARIABLE_ELEMENT);

 		}

 		return variableElement;

@@ -239,38 +253,41 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setConstraint(String newConstraint) {

 		String oldConstraint = constraint;

 		constraint = newConstraint;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIATION_GROUP__CONSTRAINT, oldConstraint, constraint));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setKind(VariabilityDependencyKind newKind) {

 		VariabilityDependencyKind oldKind = kind;

 		kind = newKind == null ? KIND_EDEFAULT : newKind;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIATION_GROUP__KIND, oldKind, kind));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class getBase_Class() {

-		if (base_Class != null && base_Class.eIsProxy()) {

+		if(base_Class != null && base_Class.eIsProxy()) {

 			InternalEObject oldBase_Class = (InternalEObject)base_Class;

 			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);

-			if (base_Class != oldBase_Class) {

-				if (eNotificationRequired())

+			if(base_Class != oldBase_Class) {

+				if(eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VariabilityPackage.VARIATION_GROUP__BASE_CLASS, oldBase_Class, base_Class));

 			}

 		}

@@ -280,6 +297,7 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public org.eclipse.uml2.uml.Class basicGetBase_Class() {

@@ -289,22 +307,25 @@ public class VariationGroupImpl extends EAElementImpl implements VariationGroup
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {

 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;

 		base_Class = newBase_Class;

-		if (eNotificationRequired())

+		if(eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, VariabilityPackage.VARIATION_GROUP__BASE_CLASS, oldBase_Class, base_Class));

 	}

 

 	/**

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if (eIsProxy()) return super.toString();

+		if(eIsProxy())

+			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (constraint: ");

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VehicleLevelBindingImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VehicleLevelBindingImpl.java
index 44123cddd42..a5d5ab5ae4c 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VehicleLevelBindingImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/impl/VehicleLevelBindingImpl.java
@@ -31,18 +31,21 @@ import org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding;
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl#getTargetFeatureModel <em>Target Feature Model</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl#getSourceVehicleFeatureModel <em>Source Vehicle Feature Model</em>}

+ * </li>

+ * <li>{@link org.eclipse.papyrus.eastadl.variability.impl.VehicleLevelBindingImpl#getTargetFeatureModel <em>Target Feature Model</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

 public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl implements VehicleLevelBinding {

+

 	/**

 	 * The cached value of the '{@link #getSourceVehicleFeatureModel() <em>Source Vehicle Feature Model</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getSourceVehicleFeatureModel()

 	 * @generated

 	 * @ordered

@@ -53,6 +56,7 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	 * The cached value of the '{@link #getTargetFeatureModel() <em>Target Feature Model</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @see #getTargetFeatureModel()

 	 * @generated

 	 * @ordered

@@ -62,6 +66,7 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected VehicleLevelBindingImpl() {

@@ -71,6 +76,7 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -81,10 +87,11 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<FeatureModel> getSourceVehicleFeatureModel() {

-		if (sourceVehicleFeatureModel == null) {

+		if(sourceVehicleFeatureModel == null) {

 			sourceVehicleFeatureModel = new EObjectResolvingEList<FeatureModel>(FeatureModel.class, this, VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL);

 		}

 		return sourceVehicleFeatureModel;

@@ -93,10 +100,11 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EList<FeatureModel> getTargetFeatureModel() {

-		if (targetFeatureModel == null) {

+		if(targetFeatureModel == null) {

 			targetFeatureModel = new EObjectResolvingEList<FeatureModel>(FeatureModel.class, this, VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL);

 		}

 		return targetFeatureModel;

@@ -105,15 +113,16 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

-				return getSourceVehicleFeatureModel();

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

-				return getTargetFeatureModel();

+		switch(featureID) {

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

+			return getSourceVehicleFeatureModel();

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

+			return getTargetFeatureModel();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,20 +130,21 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

-				getSourceVehicleFeatureModel().clear();

-				getSourceVehicleFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);

-				return;

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

-				getTargetFeatureModel().clear();

-				getTargetFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);

-				return;

+		switch(featureID) {

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

+			getSourceVehicleFeatureModel().clear();

+			getSourceVehicleFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);

+			return;

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

+			getTargetFeatureModel().clear();

+			getTargetFeatureModel().addAll((Collection<? extends FeatureModel>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -142,17 +152,18 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

-				getSourceVehicleFeatureModel().clear();

-				return;

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

-				getTargetFeatureModel().clear();

-				return;

+		switch(featureID) {

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

+			getSourceVehicleFeatureModel().clear();

+			return;

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

+			getTargetFeatureModel().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -160,15 +171,16 @@ public class VehicleLevelBindingImpl extends ConfigurationDecisionModelImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

-				return sourceVehicleFeatureModel != null && !sourceVehicleFeatureModel.isEmpty();

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

-				return targetFeatureModel != null && !targetFeatureModel.isEmpty();

+		switch(featureID) {

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__SOURCE_VEHICLE_FEATURE_MODEL:

+			return sourceVehicleFeatureModel != null && !sourceVehicleFeatureModel.isEmpty();

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING__TARGET_FEATURE_MODEL:

+			return targetFeatureModel != null && !targetFeatureModel.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityAdapterFactory.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityAdapterFactory.java
index 67e4369472e..7c6abd08d54 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityAdapterFactory.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityAdapterFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification;

+import org.eclipse.papyrus.eastadl.variability.*;

 import org.eclipse.papyrus.eastadl.variability.ConfigurableContainer;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecision;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder;

@@ -42,8 +43,9 @@ import org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding;
 

 

 /**

- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

- * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage

  * @generated

  */

@@ -52,6 +54,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * The cached model package.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static VariabilityPackage modelPackage;

@@ -60,98 +63,120 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc --> <!--

 	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected VariabilitySwitch<Adapter> modelSwitch = new VariabilitySwitch<Adapter>() {

-			@Override

-			public Adapter caseVariationGroup(VariationGroup object) {

-				return createVariationGroupAdapter();

-			}

-			@Override

-			public Adapter caseVariableElement(VariableElement object) {

-				return createVariableElementAdapter();

-			}

-			@Override

-			public Adapter caseReuseMetaInformation(ReuseMetaInformation object) {

-				return createReuseMetaInformationAdapter();

-			}

-			@Override

-			public Adapter caseConfigurableContainer(ConfigurableContainer object) {

-				return createConfigurableContainerAdapter();

-			}

-			@Override

-			public Adapter caseInternalBinding(InternalBinding object) {

-				return createInternalBindingAdapter();

-			}

-			@Override

-			public Adapter caseConfigurationDecisionModel(ConfigurationDecisionModel object) {

-				return createConfigurationDecisionModelAdapter();

-			}

-			@Override

-			public Adapter caseConfigurationDecisionModelEntry(ConfigurationDecisionModelEntry object) {

-				return createConfigurationDecisionModelEntryAdapter();

-			}

-			@Override

-			public Adapter caseVariability(Variability object) {

-				return createVariabilityAdapter();

-			}

-			@Override

-			public Adapter caseFeatureConfiguration(FeatureConfiguration object) {

-				return createFeatureConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseVehicleLevelBinding(VehicleLevelBinding object) {

-				return createVehicleLevelBindingAdapter();

-			}

-			@Override

-			public Adapter caseConfigurationDecision(ConfigurationDecision object) {

-				return createConfigurationDecisionAdapter();

-			}

-			@Override

-			public Adapter caseSelectionCriterion(SelectionCriterion object) {

-				return createSelectionCriterionAdapter();

-			}

-			@Override

-			public Adapter caseConfigurationDecisionFolder(ConfigurationDecisionFolder object) {

-				return createConfigurationDecisionFolderAdapter();

-			}

-			@Override

-			public Adapter caseContainerConfiguration(ContainerConfiguration object) {

-				return createContainerConfigurationAdapter();

-			}

-			@Override

-			public Adapter casePrivateContent(PrivateContent object) {

-				return createPrivateContentAdapter();

-			}

-			@Override

-			public Adapter caseEAElement(EAElement object) {

-				return createEAElementAdapter();

-			}

-			@Override

-			public Adapter caseEAPackageableElement(EAPackageableElement object) {

-				return createEAPackageableElementAdapter();

-			}

-			@Override

-			public Adapter caseTraceableSpecification(TraceableSpecification object) {

-				return createTraceableSpecificationAdapter();

-			}

-			@Override

-			public Adapter caseContext(Context object) {

-				return createContextAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+

+		@Override

+		public Adapter caseVariationGroup(VariationGroup object) {

+			return createVariationGroupAdapter();

+		}

+

+		@Override

+		public Adapter caseVariableElement(VariableElement object) {

+			return createVariableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseReuseMetaInformation(ReuseMetaInformation object) {

+			return createReuseMetaInformationAdapter();

+		}

+

+		@Override

+		public Adapter caseConfigurableContainer(ConfigurableContainer object) {

+			return createConfigurableContainerAdapter();

+		}

+

+		@Override

+		public Adapter caseInternalBinding(InternalBinding object) {

+			return createInternalBindingAdapter();

+		}

+

+		@Override

+		public Adapter caseConfigurationDecisionModel(ConfigurationDecisionModel object) {

+			return createConfigurationDecisionModelAdapter();

+		}

+

+		@Override

+		public Adapter caseConfigurationDecisionModelEntry(ConfigurationDecisionModelEntry object) {

+			return createConfigurationDecisionModelEntryAdapter();

+		}

+

+		@Override

+		public Adapter caseVariability(Variability object) {

+			return createVariabilityAdapter();

+		}

+

+		@Override

+		public Adapter caseFeatureConfiguration(FeatureConfiguration object) {

+			return createFeatureConfigurationAdapter();

+		}

+

+		@Override

+		public Adapter caseVehicleLevelBinding(VehicleLevelBinding object) {

+			return createVehicleLevelBindingAdapter();

+		}

+

+		@Override

+		public Adapter caseConfigurationDecision(ConfigurationDecision object) {

+			return createConfigurationDecisionAdapter();

+		}

+

+		@Override

+		public Adapter caseSelectionCriterion(SelectionCriterion object) {

+			return createSelectionCriterionAdapter();

+		}

+

+		@Override

+		public Adapter caseConfigurationDecisionFolder(ConfigurationDecisionFolder object) {

+			return createConfigurationDecisionFolderAdapter();

+		}

+

+		@Override

+		public Adapter caseContainerConfiguration(ContainerConfiguration object) {

+			return createContainerConfigurationAdapter();

+		}

+

+		@Override

+		public Adapter casePrivateContent(PrivateContent object) {

+			return createPrivateContentAdapter();

+		}

+

+		@Override

+		public Adapter caseEAElement(EAElement object) {

+			return createEAElementAdapter();

+		}

+

+		@Override

+		public Adapter caseEAPackageableElement(EAPackageableElement object) {

+			return createEAPackageableElementAdapter();

+		}

+

+		@Override

+		public Adapter caseTraceableSpecification(TraceableSpecification object) {

+			return createTraceableSpecificationAdapter();

+		}

+

+		@Override

+		public Adapter caseContext(Context object) {

+			return createContextAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityAdapterFactory() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = VariabilityPackage.eINSTANCE;

 		}

 	}

@@ -159,7 +184,9 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * 

+	 * @param target

+	 *        the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -169,11 +196,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer <em>Configurable Container</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurableContainer

+	 * <em>Configurable Container</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurableContainer

 	 * @generated

@@ -183,11 +212,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision <em>Configuration Decision</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecision

+	 * <em>Configuration Decision</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecision

 	 * @generated

@@ -197,11 +228,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder <em>Configuration Decision Folder</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder

+	 * <em>Configuration Decision Folder</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder

 	 * @generated

@@ -211,11 +244,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel <em>Configuration Decision Model</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel

+	 * <em>Configuration Decision Model</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModel

 	 * @generated

@@ -225,11 +260,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry <em>Configuration Decision Model Entry</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry

+	 * <em>Configuration Decision Model Entry</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionModelEntry

 	 * @generated

@@ -239,11 +276,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration <em>Container Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ContainerConfiguration

+	 * <em>Container Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ContainerConfiguration

 	 * @generated

@@ -258,6 +297,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.Context

 	 * @generated

@@ -270,6 +310,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc --> This default

 	 * implementation returns null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -278,11 +319,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration <em>Feature Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.FeatureConfiguration

+	 * <em>Feature Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.FeatureConfiguration

 	 * @generated

@@ -292,11 +335,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding <em>Vehicle Level Binding</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding

+	 * <em>Vehicle Level Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding

 	 * @generated

@@ -311,6 +356,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.InternalBinding

 	 * @generated

@@ -325,6 +371,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.PrivateContent

 	 * @generated

@@ -339,6 +386,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement

 	 * @generated

@@ -348,11 +396,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement <em>EA Packageable Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

+	 * <em>EA Packageable Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement

 	 * @generated

@@ -362,10 +412,12 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation <em>Reuse Meta Information</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation

+	 * <em>Reuse Meta Information</em>}'.

 	 * <!-- begin-user-doc --> This default implementation

 	 * returns null so that we can easily ignore cases; it's useful to ignore a case when

 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.ReuseMetaInformation

 	 * @generated

@@ -380,6 +432,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.SelectionCriterion

 	 * @generated

@@ -389,11 +442,13 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification <em>Traceable Specification</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

+	 * <em>Traceable Specification</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification

 	 * @generated

@@ -408,6 +463,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.Variability

 	 * @generated

@@ -422,6 +478,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariableElement

 	 * @generated

@@ -435,6 +492,7 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null

 	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch

 	 * all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.eastadl.variability.VariationGroup

 	 * @generated

@@ -448,15 +506,16 @@ public class VariabilityAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc

 	 * --> This implementation returns <code>true</code> if the object is either the model's package

 	 * or is an instance object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

+		if(object == modelPackage) {

 			return true;

 		}

-		if (object instanceof EObject) {

+		if(object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceFactoryImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceFactoryImpl.java
index daaf5c3a05c..ab229b72246 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceFactoryImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 /**

  * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!--

  * end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.util.VariabilityResourceImpl

  * @generated

  */

@@ -31,6 +32,7 @@ public class VariabilityResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityResourceFactoryImpl() {

@@ -40,6 +42,7 @@ public class VariabilityResourceFactoryImpl extends ResourceFactoryImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceImpl.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceImpl.java
index ece0ae9e5ff..928b205dc84 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceImpl.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityResourceImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 

 /**

  * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.util.VariabilityResourceFactoryImpl

  * @generated

  */

@@ -28,7 +29,9 @@ public class VariabilityResourceImpl extends XMLResourceImpl {
 	/**

 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

+	 * 

+	 * @param uri

+	 *        the URI of the new resource.

 	 * @generated

 	 */

 	public VariabilityResourceImpl(URI uri) {

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilitySwitch.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilitySwitch.java
index 8ab13a6a167..6da4bd1e464 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilitySwitch.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilitySwitch.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.EAPackageableElement;

 import org.eclipse.papyrus.eastadl.infrastructure.elements.TraceableSpecification;

+import org.eclipse.papyrus.eastadl.variability.*;

 import org.eclipse.papyrus.eastadl.variability.ConfigurableContainer;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecision;

 import org.eclipse.papyrus.eastadl.variability.ConfigurationDecisionFolder;

@@ -46,6 +47,7 @@ import org.eclipse.papyrus.eastadl.variability.VehicleLevelBinding;
  * each class of the model, starting with the actual class of the object and proceeding up the

  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.papyrus.eastadl.variability.VariabilityPackage

  * @generated

  */

@@ -54,6 +56,7 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	/**

 	 * The cached model package

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static VariabilityPackage modelPackage;

@@ -61,10 +64,11 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	/**

 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilitySwitch() {

-		if (modelPackage == null) {

+		if(modelPackage == null) {

 			modelPackage = VariabilityPackage.eINSTANCE;

 		}

 	}

@@ -73,6 +77,7 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -88,7 +93,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Configurable Container</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -103,7 +110,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Configuration Decision</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -118,7 +127,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Configuration Decision Folder</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -133,7 +144,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Configuration Decision Model</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -148,7 +161,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Configuration Decision Model Entry</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -163,7 +178,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Container Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -178,7 +195,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Context</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -193,7 +212,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -208,7 +229,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Vehicle Level Binding</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -223,7 +246,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Internal Binding</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -238,7 +263,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Private Content</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -253,7 +280,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -268,7 +297,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EA Packageable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -281,7 +312,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Reuse Meta Information</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null;

 	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Reuse Meta Information</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -296,7 +329,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Selection Criterion</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -311,7 +346,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Traceable Specification</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -326,7 +363,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Variability</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -341,7 +380,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Variable Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -354,7 +395,9 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * Returns the result of interpreting the object as an instance of '<em>Variation Group</em>'.

 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * 

+	 * @param object

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Variation Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -369,7 +412,7 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->

 	 * 

 	 * @param object

-	 *            the target of the switch.

+	 *        the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -382,127 +425,183 @@ public class VariabilitySwitch<T> extends Switch<T> {
 	/**

 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case VariabilityPackage.VARIATION_GROUP: {

-				VariationGroup variationGroup = (VariationGroup)theEObject;

-				T result = caseVariationGroup(variationGroup);

-				if (result == null) result = caseEAElement(variationGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.VARIABLE_ELEMENT: {

-				VariableElement variableElement = (VariableElement)theEObject;

-				T result = caseVariableElement(variableElement);

-				if (result == null) result = caseEAElement(variableElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.REUSE_META_INFORMATION: {

-				ReuseMetaInformation reuseMetaInformation = (ReuseMetaInformation)theEObject;

-				T result = caseReuseMetaInformation(reuseMetaInformation);

-				if (result == null) result = caseTraceableSpecification(reuseMetaInformation);

-				if (result == null) result = caseEAPackageableElement(reuseMetaInformation);

-				if (result == null) result = caseEAElement(reuseMetaInformation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONFIGURABLE_CONTAINER: {

-				ConfigurableContainer configurableContainer = (ConfigurableContainer)theEObject;

-				T result = caseConfigurableContainer(configurableContainer);

-				if (result == null) result = caseEAElement(configurableContainer);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.INTERNAL_BINDING: {

-				InternalBinding internalBinding = (InternalBinding)theEObject;

-				T result = caseInternalBinding(internalBinding);

-				if (result == null) result = caseConfigurationDecisionModel(internalBinding);

-				if (result == null) result = caseEAElement(internalBinding);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL: {

-				ConfigurationDecisionModel configurationDecisionModel = (ConfigurationDecisionModel)theEObject;

-				T result = caseConfigurationDecisionModel(configurationDecisionModel);

-				if (result == null) result = caseEAElement(configurationDecisionModel);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY: {

-				ConfigurationDecisionModelEntry configurationDecisionModelEntry = (ConfigurationDecisionModelEntry)theEObject;

-				T result = caseConfigurationDecisionModelEntry(configurationDecisionModelEntry);

-				if (result == null) result = caseEAElement(configurationDecisionModelEntry);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.VARIABILITY: {

-				Variability variability = (Variability)theEObject;

-				T result = caseVariability(variability);

-				if (result == null) result = caseContext(variability);

-				if (result == null) result = caseEAElement(variability);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.FEATURE_CONFIGURATION: {

-				FeatureConfiguration featureConfiguration = (FeatureConfiguration)theEObject;

-				T result = caseFeatureConfiguration(featureConfiguration);

-				if (result == null) result = caseConfigurationDecisionModel(featureConfiguration);

-				if (result == null) result = caseEAElement(featureConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.VEHICLE_LEVEL_BINDING: {

-				VehicleLevelBinding vehicleLevelBinding = (VehicleLevelBinding)theEObject;

-				T result = caseVehicleLevelBinding(vehicleLevelBinding);

-				if (result == null) result = caseConfigurationDecisionModel(vehicleLevelBinding);

-				if (result == null) result = caseEAElement(vehicleLevelBinding);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONFIGURATION_DECISION: {

-				ConfigurationDecision configurationDecision = (ConfigurationDecision)theEObject;

-				T result = caseConfigurationDecision(configurationDecision);

-				if (result == null) result = caseConfigurationDecisionModelEntry(configurationDecision);

-				if (result == null) result = caseEAElement(configurationDecision);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.SELECTION_CRITERION: {

-				SelectionCriterion selectionCriterion = (SelectionCriterion)theEObject;

-				T result = caseSelectionCriterion(selectionCriterion);

-				if (result == null) result = caseEAElement(selectionCriterion);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONFIGURATION_DECISION_FOLDER: {

-				ConfigurationDecisionFolder configurationDecisionFolder = (ConfigurationDecisionFolder)theEObject;

-				T result = caseConfigurationDecisionFolder(configurationDecisionFolder);

-				if (result == null) result = caseConfigurationDecisionModelEntry(configurationDecisionFolder);

-				if (result == null) result = caseEAElement(configurationDecisionFolder);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.CONTAINER_CONFIGURATION: {

-				ContainerConfiguration containerConfiguration = (ContainerConfiguration)theEObject;

-				T result = caseContainerConfiguration(containerConfiguration);

-				if (result == null) result = caseConfigurationDecisionModel(containerConfiguration);

-				if (result == null) result = caseEAElement(containerConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case VariabilityPackage.PRIVATE_CONTENT: {

-				PrivateContent privateContent = (PrivateContent)theEObject;

-				T result = casePrivateContent(privateContent);

-				if (result == null) result = caseEAElement(privateContent);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

+		switch(classifierID) {

+		case VariabilityPackage.VARIATION_GROUP:

+		{

+			VariationGroup variationGroup = (VariationGroup)theEObject;

+			T result = caseVariationGroup(variationGroup);

+			if(result == null)

+				result = caseEAElement(variationGroup);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.VARIABLE_ELEMENT:

+		{

+			VariableElement variableElement = (VariableElement)theEObject;

+			T result = caseVariableElement(variableElement);

+			if(result == null)

+				result = caseEAElement(variableElement);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.REUSE_META_INFORMATION:

+		{

+			ReuseMetaInformation reuseMetaInformation = (ReuseMetaInformation)theEObject;

+			T result = caseReuseMetaInformation(reuseMetaInformation);

+			if(result == null)

+				result = caseTraceableSpecification(reuseMetaInformation);

+			if(result == null)

+				result = caseEAPackageableElement(reuseMetaInformation);

+			if(result == null)

+				result = caseEAElement(reuseMetaInformation);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONFIGURABLE_CONTAINER:

+		{

+			ConfigurableContainer configurableContainer = (ConfigurableContainer)theEObject;

+			T result = caseConfigurableContainer(configurableContainer);

+			if(result == null)

+				result = caseEAElement(configurableContainer);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.INTERNAL_BINDING:

+		{

+			InternalBinding internalBinding = (InternalBinding)theEObject;

+			T result = caseInternalBinding(internalBinding);

+			if(result == null)

+				result = caseConfigurationDecisionModel(internalBinding);

+			if(result == null)

+				result = caseEAElement(internalBinding);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL:

+		{

+			ConfigurationDecisionModel configurationDecisionModel = (ConfigurationDecisionModel)theEObject;

+			T result = caseConfigurationDecisionModel(configurationDecisionModel);

+			if(result == null)

+				result = caseEAElement(configurationDecisionModel);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONFIGURATION_DECISION_MODEL_ENTRY:

+		{

+			ConfigurationDecisionModelEntry configurationDecisionModelEntry = (ConfigurationDecisionModelEntry)theEObject;

+			T result = caseConfigurationDecisionModelEntry(configurationDecisionModelEntry);

+			if(result == null)

+				result = caseEAElement(configurationDecisionModelEntry);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.VARIABILITY:

+		{

+			Variability variability = (Variability)theEObject;

+			T result = caseVariability(variability);

+			if(result == null)

+				result = caseContext(variability);

+			if(result == null)

+				result = caseEAElement(variability);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.FEATURE_CONFIGURATION:

+		{

+			FeatureConfiguration featureConfiguration = (FeatureConfiguration)theEObject;

+			T result = caseFeatureConfiguration(featureConfiguration);

+			if(result == null)

+				result = caseConfigurationDecisionModel(featureConfiguration);

+			if(result == null)

+				result = caseEAElement(featureConfiguration);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.VEHICLE_LEVEL_BINDING:

+		{

+			VehicleLevelBinding vehicleLevelBinding = (VehicleLevelBinding)theEObject;

+			T result = caseVehicleLevelBinding(vehicleLevelBinding);

+			if(result == null)

+				result = caseConfigurationDecisionModel(vehicleLevelBinding);

+			if(result == null)

+				result = caseEAElement(vehicleLevelBinding);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONFIGURATION_DECISION:

+		{

+			ConfigurationDecision configurationDecision = (ConfigurationDecision)theEObject;

+			T result = caseConfigurationDecision(configurationDecision);

+			if(result == null)

+				result = caseConfigurationDecisionModelEntry(configurationDecision);

+			if(result == null)

+				result = caseEAElement(configurationDecision);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.SELECTION_CRITERION:

+		{

+			SelectionCriterion selectionCriterion = (SelectionCriterion)theEObject;

+			T result = caseSelectionCriterion(selectionCriterion);

+			if(result == null)

+				result = caseEAElement(selectionCriterion);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONFIGURATION_DECISION_FOLDER:

+		{

+			ConfigurationDecisionFolder configurationDecisionFolder = (ConfigurationDecisionFolder)theEObject;

+			T result = caseConfigurationDecisionFolder(configurationDecisionFolder);

+			if(result == null)

+				result = caseConfigurationDecisionModelEntry(configurationDecisionFolder);

+			if(result == null)

+				result = caseEAElement(configurationDecisionFolder);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.CONTAINER_CONFIGURATION:

+		{

+			ContainerConfiguration containerConfiguration = (ContainerConfiguration)theEObject;

+			T result = caseContainerConfiguration(containerConfiguration);

+			if(result == null)

+				result = caseConfigurationDecisionModel(containerConfiguration);

+			if(result == null)

+				result = caseEAElement(containerConfiguration);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case VariabilityPackage.PRIVATE_CONTENT:

+		{

+			PrivateContent privateContent = (PrivateContent)theEObject;

+			T result = casePrivateContent(privateContent);

+			if(result == null)

+				result = caseEAElement(privateContent);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		default:

+			return defaultCase(theEObject);

 		}

 	}

 

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityXMLProcessor.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityXMLProcessor.java
index e3451a23544..9f58d6ea404 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityXMLProcessor.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/variability/util/VariabilityXMLProcessor.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.eastadl.variability.VariabilityPackage;
  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc

  * --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class VariabilityXMLProcessor extends XMLProcessor {

@@ -34,6 +35,7 @@ public class VariabilityXMLProcessor extends XMLProcessor {
 	/**

 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public VariabilityXMLProcessor() {

@@ -49,7 +51,7 @@ public class VariabilityXMLProcessor extends XMLProcessor {
 	 */

 	@Override

 	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

+		if(registrations == null) {

 			super.getRegistrations();

 			registrations.put(XML_EXTENSION, new VariabilityResourceFactoryImpl());

 			registrations.put(STAR_EXTENSION, new VariabilityResourceFactoryImpl());