Build EMF editors for XText models.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
index fc0fd85..6def0d1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/APar.ecore
@@ -19,8 +19,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="importURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/resource/org.eclipse.amp.amf.acore/src/model/metaabm.ecore#//SAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass http://www.eclipse.org/amp/amf/abase/ABase#//Value"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass ../../../../../../../org.eclipse.amp.amf.acore/src/model/metaabm.ecore#//SAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../../../../../../org.eclipse.amp.amf.abase/src-gen/org/eclipse/amp/amf/abase/ABase.ecore#//Value"
         containment="true"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParFactory.java
index 7eee03a..1df5ec4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParFactory.java
@@ -18,56 +18,56 @@
 public interface AParFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
+     * The singleton instance of the factory.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   AParFactory eINSTANCE = org.eclipse.amp.amf.parameters.aPar.impl.AParFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Model</em>'.
-   * <!-- begin-user-doc -->
+     * 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
-   */
+     * @return a new object of class '<em>Model</em>'.
+     * @generated
+     */
   Model createModel();
 
   /**
-   * Returns a new object of class '<em>Import</em>'.
-   * <!-- begin-user-doc -->
+     * Returns a new object of class '<em>Import</em>'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Import</em>'.
-   * @generated
-   */
+     * @return a new object of class '<em>Import</em>'.
+     * @generated
+     */
   Import createImport();
 
   /**
-   * Returns a new object of class '<em>Incorporates</em>'.
-   * <!-- begin-user-doc -->
+     * Returns a new object of class '<em>Incorporates</em>'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Incorporates</em>'.
-   * @generated
-   */
+     * @return a new object of class '<em>Incorporates</em>'.
+     * @generated
+     */
   Incorporates createIncorporates();
 
   /**
-   * Returns a new object of class '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
+     * Returns a new object of class '<em>Parameter</em>'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Parameter</em>'.
-   * @generated
-   */
+     * @return a new object of class '<em>Parameter</em>'.
+     * @generated
+     */
   Parameter createParameter();
 
   /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
+     * Returns the package supported by this factory.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
+     * @return the package supported by this factory.
+     * @generated
+     */
   AParPackage getAParPackage();
 
 } //AParFactory
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParPackage.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParPackage.java
index eeb168d..6a86129 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParPackage.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/AParPackage.java
@@ -28,325 +28,325 @@
 public interface AParPackage extends EPackage
 {
   /**
-   * The package name.
-   * <!-- begin-user-doc -->
+     * The package name.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   String eNAME = "aPar";
 
   /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
+     * The package namespace URI.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   String eNS_URI = "http://www.eclipse.org/amp/amf/parameters/APar";
 
   /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
+     * The package namespace name.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   String eNS_PREFIX = "aPar";
 
   /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
+     * The singleton instance of the package.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   AParPackage eINSTANCE = org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl <em>Model</em>}' class.
-   * <!-- begin-user-doc -->
+     * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl <em>Model</em>}' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getModel()
-   * @generated
-   */
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getModel()
+     * @generated
+     */
   int MODEL = 0;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int MODEL__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Model</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Model</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int MODEL__MODEL = 1;
 
   /**
-   * The feature id for the '<em><b>Incorporates</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Incorporates</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int MODEL__INCORPORATES = 2;
 
   /**
-   * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int MODEL__PARAMETERS = 3;
 
   /**
-   * The number of structural features of the '<em>Model</em>' class.
-   * <!-- begin-user-doc -->
+     * The number of structural features of the '<em>Model</em>' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int MODEL_FEATURE_COUNT = 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl <em>Import</em>}' class.
-   * <!-- begin-user-doc -->
+     * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl <em>Import</em>}' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getImport()
-   * @generated
-   */
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getImport()
+     * @generated
+     */
   int IMPORT = 1;
 
   /**
-   * The feature id for the '<em><b>Import URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Import URI</b></em>' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int IMPORT__IMPORT_URI = 0;
 
   /**
-   * The number of structural features of the '<em>Import</em>' class.
-   * <!-- begin-user-doc -->
+     * The number of structural features of the '<em>Import</em>' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int IMPORT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl <em>Incorporates</em>}' class.
-   * <!-- begin-user-doc -->
+     * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl <em>Incorporates</em>}' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getIncorporates()
-   * @generated
-   */
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getIncorporates()
+     * @generated
+     */
   int INCORPORATES = 2;
 
   /**
-   * The feature id for the '<em><b>Import URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Import URI</b></em>' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int INCORPORATES__IMPORT_URI = 0;
 
   /**
-   * The number of structural features of the '<em>Incorporates</em>' class.
-   * <!-- begin-user-doc -->
+     * The number of structural features of the '<em>Incorporates</em>' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int INCORPORATES_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl <em>Parameter</em>}' class.
-   * <!-- begin-user-doc -->
+     * The meta object id for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl <em>Parameter</em>}' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl
-   * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getParameter()
-   * @generated
-   */
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl
+     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getParameter()
+     * @generated
+     */
   int PARAMETER = 3;
 
   /**
-   * The feature id for the '<em><b>Attribute</b></em>' reference.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Attribute</b></em>' reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int PARAMETER__ATTRIBUTE = 0;
 
   /**
-   * The feature id for the '<em><b>Value</b></em>' containment reference.
-   * <!-- begin-user-doc -->
+     * The feature id for the '<em><b>Value</b></em>' containment reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int PARAMETER__VALUE = 1;
 
   /**
-   * The number of structural features of the '<em>Parameter</em>' class.
-   * <!-- begin-user-doc -->
+     * The number of structural features of the '<em>Parameter</em>' class.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
+     * @generated
+     * @ordered
+     */
   int PARAMETER_FEATURE_COUNT = 2;
 
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Model <em>Model</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Model</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Model
-   * @generated
-   */
+     * @return the meta object for class '<em>Model</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model
+     * @generated
+     */
   EClass getModel();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Model#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Model#getName <em>Name</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Model#getName()
-   * @see #getModel()
-   * @generated
-   */
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model#getName()
+     * @see #getModel()
+     * @generated
+     */
   EAttribute getModel_Name();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getModel <em>Model</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getModel <em>Model</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Model</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Model#getModel()
-   * @see #getModel()
-   * @generated
-   */
+     * @return the meta object for the containment reference list '<em>Model</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model#getModel()
+     * @see #getModel()
+     * @generated
+     */
   EReference getModel_Model();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getIncorporates <em>Incorporates</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getIncorporates <em>Incorporates</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Incorporates</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Model#getIncorporates()
-   * @see #getModel()
-   * @generated
-   */
+     * @return the meta object for the containment reference list '<em>Incorporates</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model#getIncorporates()
+     * @see #getModel()
+     * @generated
+     */
   EReference getModel_Incorporates();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getParameters <em>Parameters</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the containment reference list '{@link org.eclipse.amp.amf.parameters.aPar.Model#getParameters <em>Parameters</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Parameters</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Model#getParameters()
-   * @see #getModel()
-   * @generated
-   */
+     * @return the meta object for the containment reference list '<em>Parameters</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model#getParameters()
+     * @see #getModel()
+     * @generated
+     */
   EReference getModel_Parameters();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Import <em>Import</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Import</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Import
-   * @generated
-   */
+     * @return the meta object for class '<em>Import</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Import
+     * @generated
+     */
   EClass getImport();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Import#getImportURI <em>Import URI</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Import#getImportURI <em>Import URI</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Import URI</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Import#getImportURI()
-   * @see #getImport()
-   * @generated
-   */
+     * @return the meta object for the attribute '<em>Import URI</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Import#getImportURI()
+     * @see #getImport()
+     * @generated
+     */
   EAttribute getImport_ImportURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates <em>Incorporates</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates <em>Incorporates</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Incorporates</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Incorporates
-   * @generated
-   */
+     * @return the meta object for class '<em>Incorporates</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Incorporates
+     * @generated
+     */
   EClass getIncorporates();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI <em>Import URI</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the attribute '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI <em>Import URI</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Import URI</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI()
-   * @see #getIncorporates()
-   * @generated
-   */
+     * @return the meta object for the attribute '<em>Import URI</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI()
+     * @see #getIncorporates()
+     * @generated
+     */
   EAttribute getIncorporates_ImportURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Parameter <em>Parameter</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for class '{@link org.eclipse.amp.amf.parameters.aPar.Parameter <em>Parameter</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Parameter</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Parameter
-   * @generated
-   */
+     * @return the meta object for class '<em>Parameter</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Parameter
+     * @generated
+     */
   EClass getParameter();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute <em>Attribute</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the reference '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute <em>Attribute</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Attribute</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute()
-   * @see #getParameter()
-   * @generated
-   */
+     * @return the meta object for the reference '<em>Attribute</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute()
+     * @see #getParameter()
+     * @generated
+     */
   EReference getParameter_Attribute();
 
   /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getValue <em>Value</em>}'.
-   * <!-- begin-user-doc -->
+     * Returns the meta object for the containment reference '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Value</em>'.
-   * @see org.eclipse.amp.amf.parameters.aPar.Parameter#getValue()
-   * @see #getParameter()
-   * @generated
-   */
+     * @return the meta object for the containment reference '<em>Value</em>'.
+     * @see org.eclipse.amp.amf.parameters.aPar.Parameter#getValue()
+     * @see #getParameter()
+     * @generated
+     */
   EReference getParameter_Value();
 
   /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
+     * 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
-   */
+     * @return the factory that creates the instances of the model.
+     * @generated
+     */
   AParFactory getAParFactory();
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * Defines literals for the meta objects that represent
    * <ul>
    *   <li>each class,</li>
@@ -355,112 +355,112 @@
    *   <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl <em>Model</em>}' class.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl <em>Model</em>}' class.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getModel()
-     * @generated
-     */
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.ModelImpl
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getModel()
+         * @generated
+         */
     EClass MODEL = eINSTANCE.getModel();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EAttribute MODEL__NAME = eINSTANCE.getModel_Name();
 
     /**
-     * The meta object literal for the '<em><b>Model</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Model</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EReference MODEL__MODEL = eINSTANCE.getModel_Model();
 
     /**
-     * The meta object literal for the '<em><b>Incorporates</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Incorporates</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EReference MODEL__INCORPORATES = eINSTANCE.getModel_Incorporates();
 
     /**
-     * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EReference MODEL__PARAMETERS = eINSTANCE.getModel_Parameters();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl <em>Import</em>}' class.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl <em>Import</em>}' class.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getImport()
-     * @generated
-     */
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.ImportImpl
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getImport()
+         * @generated
+         */
     EClass IMPORT = eINSTANCE.getImport();
 
     /**
-     * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EAttribute IMPORT__IMPORT_URI = eINSTANCE.getImport_ImportURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl <em>Incorporates</em>}' class.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl <em>Incorporates</em>}' class.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getIncorporates()
-     * @generated
-     */
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.IncorporatesImpl
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getIncorporates()
+         * @generated
+         */
     EClass INCORPORATES = eINSTANCE.getIncorporates();
 
     /**
-     * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EAttribute INCORPORATES__IMPORT_URI = eINSTANCE.getIncorporates_ImportURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl <em>Parameter</em>}' class.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '{@link org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl <em>Parameter</em>}' class.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl
-     * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getParameter()
-     * @generated
-     */
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.ParameterImpl
+         * @see org.eclipse.amp.amf.parameters.aPar.impl.AParPackageImpl#getParameter()
+         * @generated
+         */
     EClass PARAMETER = eINSTANCE.getParameter();
 
     /**
-     * The meta object literal for the '<em><b>Attribute</b></em>' reference feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Attribute</b></em>' reference feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EReference PARAMETER__ATTRIBUTE = eINSTANCE.getParameter_Attribute();
 
     /**
-     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
+         * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+         * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+         * @generated
+         */
     EReference PARAMETER__VALUE = eINSTANCE.getParameter_Value();
 
   }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Import.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Import.java
index 7d91f0c..efdb9c4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Import.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Import.java
@@ -26,29 +26,29 @@
 public interface Import extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Import URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Import URI</b></em>' attribute.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Import URI</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Import URI</em>' attribute.
-   * @see #setImportURI(String)
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getImport_ImportURI()
-   * @model
-   * @generated
-   */
+     * @return the value of the '<em>Import URI</em>' attribute.
+     * @see #setImportURI(String)
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getImport_ImportURI()
+     * @model
+     * @generated
+     */
   String getImportURI();
 
   /**
-   * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Import#getImportURI <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Import#getImportURI <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Import URI</em>' attribute.
-   * @see #getImportURI()
-   * @generated
-   */
+     * @param value the new value of the '<em>Import URI</em>' attribute.
+     * @see #getImportURI()
+     * @generated
+     */
   void setImportURI(String value);
 
 } // Import
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Incorporates.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Incorporates.java
index 7331394..4b3aeef 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Incorporates.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Incorporates.java
@@ -26,29 +26,29 @@
 public interface Incorporates extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Import URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Import URI</b></em>' attribute.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Import URI</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Import URI</em>' attribute.
-   * @see #setImportURI(String)
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getIncorporates_ImportURI()
-   * @model
-   * @generated
-   */
+     * @return the value of the '<em>Import URI</em>' attribute.
+     * @see #setImportURI(String)
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getIncorporates_ImportURI()
+     * @model
+     * @generated
+     */
   String getImportURI();
 
   /**
-   * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates#getImportURI <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Import URI</em>' attribute.
-   * @see #getImportURI()
-   * @generated
-   */
+     * @param value the new value of the '<em>Import URI</em>' attribute.
+     * @see #getImportURI()
+     * @generated
+     */
   void setImportURI(String value);
 
 } // Incorporates
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
index f23124b..bae2a03 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Model.java
@@ -31,77 +31,77 @@
 public interface Model extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+     * 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...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Name()
-   * @model
-   * @generated
-   */
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Name()
+     * @model
+     * @generated
+     */
   String getName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Model#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Model#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Model</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Import}.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Model</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Import}.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>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>Model</em>' containment reference list.
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Model()
-   * @model containment="true"
-   * @generated
-   */
+     * @return the value of the '<em>Model</em>' containment reference list.
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Model()
+     * @model containment="true"
+     * @generated
+     */
   EList<Import> getModel();
 
   /**
-   * Returns the value of the '<em><b>Incorporates</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Incorporates}.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Incorporates</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Incorporates}.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Incorporates</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>Incorporates</em>' containment reference list.
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Incorporates()
-   * @model containment="true"
-   * @generated
-   */
+     * @return the value of the '<em>Incorporates</em>' containment reference list.
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Incorporates()
+     * @model containment="true"
+     * @generated
+     */
   EList<Incorporates> getIncorporates();
 
   /**
-   * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Parameter}.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.amp.amf.parameters.aPar.Parameter}.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Parameters</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>Parameters</em>' containment reference list.
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Parameters()
-   * @model containment="true"
-   * @generated
-   */
+     * @return the value of the '<em>Parameters</em>' containment reference list.
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getModel_Parameters()
+     * @model containment="true"
+     * @generated
+     */
   EList<Parameter> getParameters();
 
 } // Model
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Parameter.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Parameter.java
index e44f67f..42d94c4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Parameter.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/Parameter.java
@@ -31,55 +31,55 @@
 public interface Parameter extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Attribute</b></em>' reference.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Attribute</b></em>' reference.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Attribute</em>' reference isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Attribute</em>' reference.
-   * @see #setAttribute(SAttribute)
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getParameter_Attribute()
-   * @model
-   * @generated
-   */
+     * @return the value of the '<em>Attribute</em>' reference.
+     * @see #setAttribute(SAttribute)
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getParameter_Attribute()
+     * @model
+     * @generated
+     */
   SAttribute getAttribute();
 
   /**
-   * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute <em>Attribute</em>}' reference.
-   * <!-- begin-user-doc -->
+     * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getAttribute <em>Attribute</em>}' reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Attribute</em>' reference.
-   * @see #getAttribute()
-   * @generated
-   */
+     * @param value the new value of the '<em>Attribute</em>' reference.
+     * @see #getAttribute()
+     * @generated
+     */
   void setAttribute(SAttribute value);
 
   /**
-   * Returns the value of the '<em><b>Value</b></em>' containment reference.
-   * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Value</b></em>' containment reference.
+     * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>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>Value</em>' containment reference.
-   * @see #setValue(Value)
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getParameter_Value()
-   * @model containment="true"
-   * @generated
-   */
+     * @return the value of the '<em>Value</em>' containment reference.
+     * @see #setValue(Value)
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#getParameter_Value()
+     * @model containment="true"
+     * @generated
+     */
   Value getValue();
 
   /**
-   * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getValue <em>Value</em>}' containment reference.
-   * <!-- begin-user-doc -->
+     * Sets the value of the '{@link org.eclipse.amp.amf.parameters.aPar.Parameter#getValue <em>Value</em>}' containment reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Value</em>' containment reference.
-   * @see #getValue()
-   * @generated
-   */
+     * @param value the new value of the '<em>Value</em>' containment reference.
+     * @see #getValue()
+     * @generated
+     */
   void setValue(Value value);
 
 } // Parameter
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParFactoryImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParFactoryImpl.java
index 5023bff..730cbfe 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParFactoryImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParFactoryImpl.java
@@ -24,122 +24,118 @@
 public class AParFactoryImpl extends EFactoryImpl implements AParFactory
 {
   /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
+     * Creates the default factory implementation.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public static AParFactory init()
   {
-    try
-    {
-      AParFactory theAParFactory = (AParFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amp/amf/parameters/APar"); 
-      if (theAParFactory != null)
-      {
-        return theAParFactory;
-      }
+        try {
+            AParFactory theAParFactory = (AParFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amp/amf/parameters/APar"); 
+            if (theAParFactory != null) {
+                return theAParFactory;
+            }
+        }
+        catch (Exception exception) {
+            EcorePlugin.INSTANCE.log(exception);
+        }
+        return new AParFactoryImpl();
     }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new AParFactoryImpl();
-  }
 
   /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
+     * Creates an instance of the factory.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public AParFactoryImpl()
   {
-    super();
-  }
+        super();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public EObject create(EClass eClass)
   {
-    switch (eClass.getClassifierID())
-    {
-      case AParPackage.MODEL: return createModel();
-      case AParPackage.IMPORT: return createImport();
-      case AParPackage.INCORPORATES: return createIncorporates();
-      case AParPackage.PARAMETER: return createParameter();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        switch (eClass.getClassifierID()) {
+            case AParPackage.MODEL: return createModel();
+            case AParPackage.IMPORT: return createImport();
+            case AParPackage.INCORPORATES: return createIncorporates();
+            case AParPackage.PARAMETER: return createParameter();
+            default:
+                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        }
     }
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public Model createModel()
   {
-    ModelImpl model = new ModelImpl();
-    return model;
-  }
+        ModelImpl model = new ModelImpl();
+        return model;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public Import createImport()
   {
-    ImportImpl import_ = new ImportImpl();
-    return import_;
-  }
+        ImportImpl import_ = new ImportImpl();
+        return import_;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public Incorporates createIncorporates()
   {
-    IncorporatesImpl incorporates = new IncorporatesImpl();
-    return incorporates;
-  }
+        IncorporatesImpl incorporates = new IncorporatesImpl();
+        return incorporates;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public Parameter createParameter()
   {
-    ParameterImpl parameter = new ParameterImpl();
-    return parameter;
-  }
+        ParameterImpl parameter = new ParameterImpl();
+        return parameter;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public AParPackage getAParPackage()
   {
-    return (AParPackage)getEPackage();
-  }
+        return (AParPackage)getEPackage();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
+     * @deprecated
+     * @generated
+     */
   @Deprecated
   public static AParPackage getPackage()
   {
-    return AParPackage.eINSTANCE;
-  }
+        return AParPackage.eINSTANCE;
+    }
 
 } //AParFactoryImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
index 79181ea..58c9d54 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/AParPackageImpl.java
@@ -32,320 +32,320 @@
 public class AParPackageImpl extends EPackageImpl implements AParPackage
 {
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private EClass modelEClass = null;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private EClass importEClass = null;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private EClass incorporatesEClass = null;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private EClass parameterEClass = null;
 
   /**
-   * 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 -->
+     * 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 -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
+     * @see org.eclipse.emf.ecore.EPackage.Registry
+     * @see org.eclipse.amp.amf.parameters.aPar.AParPackage#eNS_URI
+     * @see #init()
+     * @generated
+     */
   private AParPackageImpl()
   {
-    super(eNS_URI, AParFactory.eINSTANCE);
-  }
+        super(eNS_URI, AParFactory.eINSTANCE);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private static boolean isInited = false;
 
   /**
-   * 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 AParPackage#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 -->
+     * 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 AParPackage#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
-   */
+     * @see #eNS_URI
+     * @see #createPackageContents()
+     * @see #initializePackageContents()
+     * @generated
+     */
   public static AParPackage init()
   {
-    if (isInited) return (AParPackage)EPackage.Registry.INSTANCE.getEPackage(AParPackage.eNS_URI);
+        if (isInited) return (AParPackage)EPackage.Registry.INSTANCE.getEPackage(AParPackage.eNS_URI);
 
-    // Obtain or create and register package
-    AParPackageImpl theAParPackage = (AParPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AParPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AParPackageImpl());
+        // Obtain or create and register package
+        AParPackageImpl theAParPackage = (AParPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AParPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AParPackageImpl());
 
-    isInited = true;
+        isInited = true;
 
-    // Initialize simple dependencies
-    MetaABMPackage.eINSTANCE.eClass();
-    ABasePackage.eINSTANCE.eClass();
+        // Initialize simple dependencies
+        MetaABMPackage.eINSTANCE.eClass();
+        ABasePackage.eINSTANCE.eClass();
 
-    // Create package meta-data objects
-    theAParPackage.createPackageContents();
+        // Create package meta-data objects
+        theAParPackage.createPackageContents();
 
-    // Initialize created meta-data
-    theAParPackage.initializePackageContents();
+        // Initialize created meta-data
+        theAParPackage.initializePackageContents();
 
-    // Mark meta-data to indicate it can't be changed
-    theAParPackage.freeze();
+        // Mark meta-data to indicate it can't be changed
+        theAParPackage.freeze();
 
   
-    // Update the registry and return the package
-    EPackage.Registry.INSTANCE.put(AParPackage.eNS_URI, theAParPackage);
-    return theAParPackage;
-  }
+        // Update the registry and return the package
+        EPackage.Registry.INSTANCE.put(AParPackage.eNS_URI, theAParPackage);
+        return theAParPackage;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EClass getModel()
   {
-    return modelEClass;
-  }
+        return modelEClass;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EAttribute getModel_Name()
   {
-    return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
-  }
+        return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EReference getModel_Model()
   {
-    return (EReference)modelEClass.getEStructuralFeatures().get(1);
-  }
+        return (EReference)modelEClass.getEStructuralFeatures().get(1);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EReference getModel_Incorporates()
   {
-    return (EReference)modelEClass.getEStructuralFeatures().get(2);
-  }
+        return (EReference)modelEClass.getEStructuralFeatures().get(2);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EReference getModel_Parameters()
   {
-    return (EReference)modelEClass.getEStructuralFeatures().get(3);
-  }
+        return (EReference)modelEClass.getEStructuralFeatures().get(3);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EClass getImport()
   {
-    return importEClass;
-  }
+        return importEClass;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EAttribute getImport_ImportURI()
   {
-    return (EAttribute)importEClass.getEStructuralFeatures().get(0);
-  }
+        return (EAttribute)importEClass.getEStructuralFeatures().get(0);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EClass getIncorporates()
   {
-    return incorporatesEClass;
-  }
+        return incorporatesEClass;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EAttribute getIncorporates_ImportURI()
   {
-    return (EAttribute)incorporatesEClass.getEStructuralFeatures().get(0);
-  }
+        return (EAttribute)incorporatesEClass.getEStructuralFeatures().get(0);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EClass getParameter()
   {
-    return parameterEClass;
-  }
+        return parameterEClass;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EReference getParameter_Attribute()
   {
-    return (EReference)parameterEClass.getEStructuralFeatures().get(0);
-  }
+        return (EReference)parameterEClass.getEStructuralFeatures().get(0);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EReference getParameter_Value()
   {
-    return (EReference)parameterEClass.getEStructuralFeatures().get(1);
-  }
+        return (EReference)parameterEClass.getEStructuralFeatures().get(1);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public AParFactory getAParFactory()
   {
-    return (AParFactory)getEFactoryInstance();
-  }
+        return (AParFactory)getEFactoryInstance();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private boolean isCreated = false;
 
   /**
-   * 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 -->
+     * 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
-   */
+     * @generated
+     */
   public void createPackageContents()
   {
-    if (isCreated) return;
-    isCreated = true;
+        if (isCreated) return;
+        isCreated = true;
 
-    // Create classes and their features
-    modelEClass = createEClass(MODEL);
-    createEAttribute(modelEClass, MODEL__NAME);
-    createEReference(modelEClass, MODEL__MODEL);
-    createEReference(modelEClass, MODEL__INCORPORATES);
-    createEReference(modelEClass, MODEL__PARAMETERS);
+        // Create classes and their features
+        modelEClass = createEClass(MODEL);
+        createEAttribute(modelEClass, MODEL__NAME);
+        createEReference(modelEClass, MODEL__MODEL);
+        createEReference(modelEClass, MODEL__INCORPORATES);
+        createEReference(modelEClass, MODEL__PARAMETERS);
 
-    importEClass = createEClass(IMPORT);
-    createEAttribute(importEClass, IMPORT__IMPORT_URI);
+        importEClass = createEClass(IMPORT);
+        createEAttribute(importEClass, IMPORT__IMPORT_URI);
 
-    incorporatesEClass = createEClass(INCORPORATES);
-    createEAttribute(incorporatesEClass, INCORPORATES__IMPORT_URI);
+        incorporatesEClass = createEClass(INCORPORATES);
+        createEAttribute(incorporatesEClass, INCORPORATES__IMPORT_URI);
 
-    parameterEClass = createEClass(PARAMETER);
-    createEReference(parameterEClass, PARAMETER__ATTRIBUTE);
-    createEReference(parameterEClass, PARAMETER__VALUE);
-  }
+        parameterEClass = createEClass(PARAMETER);
+        createEReference(parameterEClass, PARAMETER__ATTRIBUTE);
+        createEReference(parameterEClass, PARAMETER__VALUE);
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   private boolean isInitialized = false;
 
   /**
-   * 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 -->
+     * 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
-   */
+     * @generated
+     */
   public void initializePackageContents()
   {
-    if (isInitialized) return;
-    isInitialized = true;
+        if (isInitialized) return;
+        isInitialized = true;
 
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
+        // Initialize package
+        setName(eNAME);
+        setNsPrefix(eNS_PREFIX);
+        setNsURI(eNS_URI);
 
-    // Obtain other dependent packages
-    MetaABMPackage theMetaABMPackage = (MetaABMPackage)EPackage.Registry.INSTANCE.getEPackage(MetaABMPackage.eNS_URI);
-    ABasePackage theABasePackage = (ABasePackage)EPackage.Registry.INSTANCE.getEPackage(ABasePackage.eNS_URI);
+        // Obtain other dependent packages
+        MetaABMPackage theMetaABMPackage = (MetaABMPackage)EPackage.Registry.INSTANCE.getEPackage(MetaABMPackage.eNS_URI);
+        ABasePackage theABasePackage = (ABasePackage)EPackage.Registry.INSTANCE.getEPackage(ABasePackage.eNS_URI);
 
-    // Create type parameters
+        // Create type parameters
 
-    // Set bounds for type parameters
+        // Set bounds for type parameters
 
-    // Add supertypes to classes
+        // Add supertypes to classes
 
-    // Initialize classes and features; add operations and parameters
-    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getModel_Model(), this.getImport(), null, "model", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getModel_Incorporates(), this.getIncorporates(), null, "incorporates", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getModel_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        // Initialize classes and features; add operations and parameters
+        initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getModel_Model(), this.getImport(), null, "model", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getModel_Incorporates(), this.getIncorporates(), null, "incorporates", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getModel_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getImport_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getImport_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(incorporatesEClass, Incorporates.class, "Incorporates", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIncorporates_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Incorporates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(incorporatesEClass, Incorporates.class, "Incorporates", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getIncorporates_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, Incorporates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getParameter_Attribute(), theMetaABMPackage.getSAttribute(), null, "attribute", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getParameter_Value(), theABasePackage.getValue(), null, "value", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getParameter_Attribute(), theMetaABMPackage.getSAttribute(), null, "attribute", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getParameter_Value(), theABasePackage.getValue(), null, "value", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    // Create resource
-    createResource(eNS_URI);
-  }
+        // Create resource
+        createResource(eNS_URI);
+    }
 
 } //AParPackageImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ImportImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ImportImpl.java
index d9bd48a..5820910 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ImportImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ImportImpl.java
@@ -31,150 +31,146 @@
 public class ImportImpl extends MinimalEObjectImpl.Container implements Import
 {
   /**
-   * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getImportURI()
-   * @generated
-   * @ordered
-   */
+     * @see #getImportURI()
+     * @generated
+     * @ordered
+     */
   protected static final String IMPORT_URI_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getImportURI()
-   * @generated
-   * @ordered
-   */
+     * @see #getImportURI()
+     * @generated
+     * @ordered
+     */
   protected String importURI = IMPORT_URI_EDEFAULT;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected ImportImpl()
   {
-    super();
-  }
+        super();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   protected EClass eStaticClass()
   {
-    return AParPackage.Literals.IMPORT;
-  }
+        return AParPackage.Literals.IMPORT;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public String getImportURI()
   {
-    return importURI;
-  }
+        return importURI;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public void setImportURI(String newImportURI)
   {
-    String oldImportURI = importURI;
-    importURI = newImportURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.IMPORT__IMPORT_URI, oldImportURI, importURI));
-  }
+        String oldImportURI = importURI;
+        importURI = newImportURI;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.IMPORT__IMPORT_URI, oldImportURI, importURI));
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-    switch (featureID)
-    {
-      case AParPackage.IMPORT__IMPORT_URI:
-        return getImportURI();
+        switch (featureID) {
+            case AParPackage.IMPORT__IMPORT_URI:
+                return getImportURI();
+        }
+        return super.eGet(featureID, resolve, coreType);
     }
-    return super.eGet(featureID, resolve, coreType);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-    switch (featureID)
-    {
-      case AParPackage.IMPORT__IMPORT_URI:
-        setImportURI((String)newValue);
-        return;
+        switch (featureID) {
+            case AParPackage.IMPORT__IMPORT_URI:
+                setImportURI((String)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
     }
-    super.eSet(featureID, newValue);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eUnset(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.IMPORT__IMPORT_URI:
-        setImportURI(IMPORT_URI_EDEFAULT);
-        return;
+        switch (featureID) {
+            case AParPackage.IMPORT__IMPORT_URI:
+                setImportURI(IMPORT_URI_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
     }
-    super.eUnset(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public boolean eIsSet(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.IMPORT__IMPORT_URI:
-        return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
+        switch (featureID) {
+            case AParPackage.IMPORT__IMPORT_URI:
+                return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
+        }
+        return super.eIsSet(featureID);
     }
-    return super.eIsSet(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+        if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (importURI: ");
-    result.append(importURI);
-    result.append(')');
-    return result.toString();
-  }
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (importURI: ");
+        result.append(importURI);
+        result.append(')');
+        return result.toString();
+    }
 
 } //ImportImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/IncorporatesImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/IncorporatesImpl.java
index 9797184..8e537f3 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/IncorporatesImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/IncorporatesImpl.java
@@ -31,150 +31,146 @@
 public class IncorporatesImpl extends MinimalEObjectImpl.Container implements Incorporates
 {
   /**
-   * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getImportURI()
-   * @generated
-   * @ordered
-   */
+     * @see #getImportURI()
+     * @generated
+     * @ordered
+     */
   protected static final String IMPORT_URI_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getImportURI()
-   * @generated
-   * @ordered
-   */
+     * @see #getImportURI()
+     * @generated
+     * @ordered
+     */
   protected String importURI = IMPORT_URI_EDEFAULT;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected IncorporatesImpl()
   {
-    super();
-  }
+        super();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   protected EClass eStaticClass()
   {
-    return AParPackage.Literals.INCORPORATES;
-  }
+        return AParPackage.Literals.INCORPORATES;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public String getImportURI()
   {
-    return importURI;
-  }
+        return importURI;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public void setImportURI(String newImportURI)
   {
-    String oldImportURI = importURI;
-    importURI = newImportURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.INCORPORATES__IMPORT_URI, oldImportURI, importURI));
-  }
+        String oldImportURI = importURI;
+        importURI = newImportURI;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.INCORPORATES__IMPORT_URI, oldImportURI, importURI));
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-    switch (featureID)
-    {
-      case AParPackage.INCORPORATES__IMPORT_URI:
-        return getImportURI();
+        switch (featureID) {
+            case AParPackage.INCORPORATES__IMPORT_URI:
+                return getImportURI();
+        }
+        return super.eGet(featureID, resolve, coreType);
     }
-    return super.eGet(featureID, resolve, coreType);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-    switch (featureID)
-    {
-      case AParPackage.INCORPORATES__IMPORT_URI:
-        setImportURI((String)newValue);
-        return;
+        switch (featureID) {
+            case AParPackage.INCORPORATES__IMPORT_URI:
+                setImportURI((String)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
     }
-    super.eSet(featureID, newValue);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eUnset(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.INCORPORATES__IMPORT_URI:
-        setImportURI(IMPORT_URI_EDEFAULT);
-        return;
+        switch (featureID) {
+            case AParPackage.INCORPORATES__IMPORT_URI:
+                setImportURI(IMPORT_URI_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
     }
-    super.eUnset(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public boolean eIsSet(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.INCORPORATES__IMPORT_URI:
-        return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
+        switch (featureID) {
+            case AParPackage.INCORPORATES__IMPORT_URI:
+                return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
+        }
+        return super.eIsSet(featureID);
     }
-    return super.eIsSet(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+        if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (importURI: ");
-    result.append(importURI);
-    result.append(')');
-    return result.toString();
-  }
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (importURI: ");
+        result.append(importURI);
+        result.append(')');
+        return result.toString();
+    }
 
 } //IncorporatesImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
index 7944562..d000b70 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ModelImpl.java
@@ -46,276 +46,268 @@
 public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 {
   /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
   protected String name = NAME_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getModel() <em>Model</em>}' containment reference list.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getModel() <em>Model</em>}' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getModel()
-   * @generated
-   * @ordered
-   */
+     * @see #getModel()
+     * @generated
+     * @ordered
+     */
   protected EList<Import> model;
 
   /**
-   * The cached value of the '{@link #getIncorporates() <em>Incorporates</em>}' containment reference list.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getIncorporates() <em>Incorporates</em>}' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getIncorporates()
-   * @generated
-   * @ordered
-   */
+     * @see #getIncorporates()
+     * @generated
+     * @ordered
+     */
   protected EList<Incorporates> incorporates;
 
   /**
-   * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getParameters()
-   * @generated
-   * @ordered
-   */
+     * @see #getParameters()
+     * @generated
+     * @ordered
+     */
   protected EList<Parameter> parameters;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected ModelImpl()
   {
-    super();
-  }
+        super();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   protected EClass eStaticClass()
   {
-    return AParPackage.Literals.MODEL;
-  }
+        return AParPackage.Literals.MODEL;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public String getName()
   {
-    return name;
-  }
+        return name;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public void setName(String newName)
   {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.MODEL__NAME, oldName, name));
-  }
+        String oldName = name;
+        name = newName;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.MODEL__NAME, oldName, name));
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EList<Import> getModel()
   {
-    if (model == null)
-    {
-      model = new EObjectContainmentEList<Import>(Import.class, this, AParPackage.MODEL__MODEL);
+        if (model == null) {
+            model = new EObjectContainmentEList<Import>(Import.class, this, AParPackage.MODEL__MODEL);
+        }
+        return model;
     }
-    return model;
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EList<Incorporates> getIncorporates()
   {
-    if (incorporates == null)
-    {
-      incorporates = new EObjectContainmentEList<Incorporates>(Incorporates.class, this, AParPackage.MODEL__INCORPORATES);
+        if (incorporates == null) {
+            incorporates = new EObjectContainmentEList<Incorporates>(Incorporates.class, this, AParPackage.MODEL__INCORPORATES);
+        }
+        return incorporates;
     }
-    return incorporates;
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public EList<Parameter> getParameters()
   {
-    if (parameters == null)
-    {
-      parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, AParPackage.MODEL__PARAMETERS);
+        if (parameters == null) {
+            parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, AParPackage.MODEL__PARAMETERS);
+        }
+        return parameters;
     }
-    return parameters;
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
-    switch (featureID)
-    {
-      case AParPackage.MODEL__MODEL:
-        return ((InternalEList<?>)getModel()).basicRemove(otherEnd, msgs);
-      case AParPackage.MODEL__INCORPORATES:
-        return ((InternalEList<?>)getIncorporates()).basicRemove(otherEnd, msgs);
-      case AParPackage.MODEL__PARAMETERS:
-        return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+        switch (featureID) {
+            case AParPackage.MODEL__MODEL:
+                return ((InternalEList<?>)getModel()).basicRemove(otherEnd, msgs);
+            case AParPackage.MODEL__INCORPORATES:
+                return ((InternalEList<?>)getIncorporates()).basicRemove(otherEnd, msgs);
+            case AParPackage.MODEL__PARAMETERS:
+                return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
     }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-    switch (featureID)
-    {
-      case AParPackage.MODEL__NAME:
-        return getName();
-      case AParPackage.MODEL__MODEL:
-        return getModel();
-      case AParPackage.MODEL__INCORPORATES:
-        return getIncorporates();
-      case AParPackage.MODEL__PARAMETERS:
-        return getParameters();
+        switch (featureID) {
+            case AParPackage.MODEL__NAME:
+                return getName();
+            case AParPackage.MODEL__MODEL:
+                return getModel();
+            case AParPackage.MODEL__INCORPORATES:
+                return getIncorporates();
+            case AParPackage.MODEL__PARAMETERS:
+                return getParameters();
+        }
+        return super.eGet(featureID, resolve, coreType);
     }
-    return super.eGet(featureID, resolve, coreType);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @SuppressWarnings("unchecked")
   @Override
   public void eSet(int featureID, Object newValue)
   {
-    switch (featureID)
-    {
-      case AParPackage.MODEL__NAME:
-        setName((String)newValue);
-        return;
-      case AParPackage.MODEL__MODEL:
-        getModel().clear();
-        getModel().addAll((Collection<? extends Import>)newValue);
-        return;
-      case AParPackage.MODEL__INCORPORATES:
-        getIncorporates().clear();
-        getIncorporates().addAll((Collection<? extends Incorporates>)newValue);
-        return;
-      case AParPackage.MODEL__PARAMETERS:
-        getParameters().clear();
-        getParameters().addAll((Collection<? extends Parameter>)newValue);
-        return;
+        switch (featureID) {
+            case AParPackage.MODEL__NAME:
+                setName((String)newValue);
+                return;
+            case AParPackage.MODEL__MODEL:
+                getModel().clear();
+                getModel().addAll((Collection<? extends Import>)newValue);
+                return;
+            case AParPackage.MODEL__INCORPORATES:
+                getIncorporates().clear();
+                getIncorporates().addAll((Collection<? extends Incorporates>)newValue);
+                return;
+            case AParPackage.MODEL__PARAMETERS:
+                getParameters().clear();
+                getParameters().addAll((Collection<? extends Parameter>)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
     }
-    super.eSet(featureID, newValue);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eUnset(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.MODEL__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case AParPackage.MODEL__MODEL:
-        getModel().clear();
-        return;
-      case AParPackage.MODEL__INCORPORATES:
-        getIncorporates().clear();
-        return;
-      case AParPackage.MODEL__PARAMETERS:
-        getParameters().clear();
-        return;
+        switch (featureID) {
+            case AParPackage.MODEL__NAME:
+                setName(NAME_EDEFAULT);
+                return;
+            case AParPackage.MODEL__MODEL:
+                getModel().clear();
+                return;
+            case AParPackage.MODEL__INCORPORATES:
+                getIncorporates().clear();
+                return;
+            case AParPackage.MODEL__PARAMETERS:
+                getParameters().clear();
+                return;
+        }
+        super.eUnset(featureID);
     }
-    super.eUnset(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public boolean eIsSet(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.MODEL__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case AParPackage.MODEL__MODEL:
-        return model != null && !model.isEmpty();
-      case AParPackage.MODEL__INCORPORATES:
-        return incorporates != null && !incorporates.isEmpty();
-      case AParPackage.MODEL__PARAMETERS:
-        return parameters != null && !parameters.isEmpty();
+        switch (featureID) {
+            case AParPackage.MODEL__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case AParPackage.MODEL__MODEL:
+                return model != null && !model.isEmpty();
+            case AParPackage.MODEL__INCORPORATES:
+                return incorporates != null && !incorporates.isEmpty();
+            case AParPackage.MODEL__PARAMETERS:
+                return parameters != null && !parameters.isEmpty();
+        }
+        return super.eIsSet(featureID);
     }
-    return super.eIsSet(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+        if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (name: ");
+        result.append(name);
+        result.append(')');
+        return result.toString();
+    }
 
 } //ModelImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ParameterImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ParameterImpl.java
index 77e7a25..5a13e3c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ParameterImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/impl/ParameterImpl.java
@@ -38,228 +38,219 @@
 public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter
 {
   /**
-   * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getAttribute()
-   * @generated
-   * @ordered
-   */
+     * @see #getAttribute()
+     * @generated
+     * @ordered
+     */
   protected SAttribute attribute;
 
   /**
-   * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-   * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getValue()
-   * @generated
-   * @ordered
-   */
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
   protected Value value;
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected ParameterImpl()
   {
-    super();
-  }
+        super();
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   protected EClass eStaticClass()
   {
-    return AParPackage.Literals.PARAMETER;
-  }
+        return AParPackage.Literals.PARAMETER;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public SAttribute getAttribute()
   {
-    if (attribute != null && attribute.eIsProxy())
-    {
-      InternalEObject oldAttribute = (InternalEObject)attribute;
-      attribute = (SAttribute)eResolveProxy(oldAttribute);
-      if (attribute != oldAttribute)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, AParPackage.PARAMETER__ATTRIBUTE, oldAttribute, attribute));
-      }
+        if (attribute != null && attribute.eIsProxy()) {
+            InternalEObject oldAttribute = (InternalEObject)attribute;
+            attribute = (SAttribute)eResolveProxy(oldAttribute);
+            if (attribute != oldAttribute) {
+                if (eNotificationRequired())
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, AParPackage.PARAMETER__ATTRIBUTE, oldAttribute, attribute));
+            }
+        }
+        return attribute;
     }
-    return attribute;
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public SAttribute basicGetAttribute()
   {
-    return attribute;
-  }
+        return attribute;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public void setAttribute(SAttribute newAttribute)
   {
-    SAttribute oldAttribute = attribute;
-    attribute = newAttribute;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__ATTRIBUTE, oldAttribute, attribute));
-  }
+        SAttribute oldAttribute = attribute;
+        attribute = newAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__ATTRIBUTE, oldAttribute, attribute));
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public Value getValue()
   {
-    return value;
-  }
+        return value;
+    }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public NotificationChain basicSetValue(Value newValue, NotificationChain msgs)
   {
-    Value oldValue = value;
-    value = newValue;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__VALUE, oldValue, newValue);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
+        Value oldValue = value;
+        value = newValue;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__VALUE, oldValue, newValue);
+            if (msgs == null) msgs = notification; else msgs.add(notification);
+        }
+        return msgs;
     }
-    return msgs;
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public void setValue(Value newValue)
   {
-    if (newValue != value)
-    {
-      NotificationChain msgs = null;
-      if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - AParPackage.PARAMETER__VALUE, null, msgs);
-      if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - AParPackage.PARAMETER__VALUE, null, msgs);
-      msgs = basicSetValue(newValue, msgs);
-      if (msgs != null) msgs.dispatch();
+        if (newValue != value) {
+            NotificationChain msgs = null;
+            if (value != null)
+                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - AParPackage.PARAMETER__VALUE, null, msgs);
+            if (newValue != null)
+                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - AParPackage.PARAMETER__VALUE, null, msgs);
+            msgs = basicSetValue(newValue, msgs);
+            if (msgs != null) msgs.dispatch();
+        }
+        else if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__VALUE, newValue, newValue));
     }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, AParPackage.PARAMETER__VALUE, newValue, newValue));
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
-    switch (featureID)
-    {
-      case AParPackage.PARAMETER__VALUE:
-        return basicSetValue(null, msgs);
+        switch (featureID) {
+            case AParPackage.PARAMETER__VALUE:
+                return basicSetValue(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
     }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public Object eGet(int featureID, boolean resolve, boolean coreType)
   {
-    switch (featureID)
-    {
-      case AParPackage.PARAMETER__ATTRIBUTE:
-        if (resolve) return getAttribute();
-        return basicGetAttribute();
-      case AParPackage.PARAMETER__VALUE:
-        return getValue();
+        switch (featureID) {
+            case AParPackage.PARAMETER__ATTRIBUTE:
+                if (resolve) return getAttribute();
+                return basicGetAttribute();
+            case AParPackage.PARAMETER__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
     }
-    return super.eGet(featureID, resolve, coreType);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eSet(int featureID, Object newValue)
   {
-    switch (featureID)
-    {
-      case AParPackage.PARAMETER__ATTRIBUTE:
-        setAttribute((SAttribute)newValue);
-        return;
-      case AParPackage.PARAMETER__VALUE:
-        setValue((Value)newValue);
-        return;
+        switch (featureID) {
+            case AParPackage.PARAMETER__ATTRIBUTE:
+                setAttribute((SAttribute)newValue);
+                return;
+            case AParPackage.PARAMETER__VALUE:
+                setValue((Value)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
     }
-    super.eSet(featureID, newValue);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public void eUnset(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.PARAMETER__ATTRIBUTE:
-        setAttribute((SAttribute)null);
-        return;
-      case AParPackage.PARAMETER__VALUE:
-        setValue((Value)null);
-        return;
+        switch (featureID) {
+            case AParPackage.PARAMETER__ATTRIBUTE:
+                setAttribute((SAttribute)null);
+                return;
+            case AParPackage.PARAMETER__VALUE:
+                setValue((Value)null);
+                return;
+        }
+        super.eUnset(featureID);
     }
-    super.eUnset(featureID);
-  }
 
   /**
-   * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   @Override
   public boolean eIsSet(int featureID)
   {
-    switch (featureID)
-    {
-      case AParPackage.PARAMETER__ATTRIBUTE:
-        return attribute != null;
-      case AParPackage.PARAMETER__VALUE:
-        return value != null;
+        switch (featureID) {
+            case AParPackage.PARAMETER__ATTRIBUTE:
+                return attribute != null;
+            case AParPackage.PARAMETER__VALUE:
+                return value != null;
+        }
+        return super.eIsSet(featureID);
     }
-    return super.eIsSet(featureID);
-  }
 
 } //ParameterImpl
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParAdapterFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParAdapterFactory.java
index 0cd9653..868c599 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParAdapterFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParAdapterFactory.java
@@ -25,171 +25,162 @@
 public class AParAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
+     * The cached model package.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected static AParPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
+     * Creates an instance of the adapter factory.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public AParAdapterFactory()
   {
-    if (modelPackage == null)
-    {
-      modelPackage = AParPackage.eINSTANCE;
+        if (modelPackage == null) {
+            modelPackage = AParPackage.eINSTANCE;
+        }
     }
-  }
 
   /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
+     * Returns whether this factory is applicable for the type of the object.
+     * <!-- 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
-   */
+     * @return whether this factory is applicable for the type of the object.
+     * @generated
+     */
   @Override
   public boolean isFactoryForType(Object object)
   {
-    if (object == modelPackage)
-    {
-      return true;
+        if (object == modelPackage) {
+            return true;
+        }
+        if (object instanceof EObject) {
+            return ((EObject)object).eClass().getEPackage() == modelPackage;
+        }
+        return false;
     }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
+     * The switch that delegates to the <code>createXXX</code> methods.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected AParSwitch<Adapter> modelSwitch =
-    new AParSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseModel(Model object)
-      {
-        return createModelAdapter();
-      }
-      @Override
-      public Adapter caseImport(Import object)
-      {
-        return createImportAdapter();
-      }
-      @Override
-      public Adapter caseIncorporates(Incorporates object)
-      {
-        return createIncorporatesAdapter();
-      }
-      @Override
-      public Adapter caseParameter(Parameter object)
-      {
-        return createParameterAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
+    new AParSwitch<Adapter>() {
+            @Override
+            public Adapter caseModel(Model object) {
+                return createModelAdapter();
+            }
+            @Override
+            public Adapter caseImport(Import object) {
+                return createImportAdapter();
+            }
+            @Override
+            public Adapter caseIncorporates(Incorporates object) {
+                return createIncorporatesAdapter();
+            }
+            @Override
+            public Adapter caseParameter(Parameter object) {
+                return createParameterAdapter();
+            }
+            @Override
+            public Adapter defaultCase(EObject object) {
+                return createEObjectAdapter();
+            }
+        };
 
   /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
+     * Creates an adapter for the <code>target</code>.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
+     * @param target the object to adapt.
+     * @return the adapter for the <code>target</code>.
+     * @generated
+     */
   @Override
   public Adapter createAdapter(Notifier target)
   {
-    return modelSwitch.doSwitch((EObject)target);
-  }
+        return modelSwitch.doSwitch((EObject)target);
+    }
 
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
+     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Model <em>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.amp.amf.parameters.aPar.Model
-   * @generated
-   */
+     * @return the new adapter.
+     * @see org.eclipse.amp.amf.parameters.aPar.Model
+     * @generated
+     */
   public Adapter createModelAdapter()
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
+     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Import <em>Import</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.amp.amf.parameters.aPar.Import
-   * @generated
-   */
+     * @return the new adapter.
+     * @see org.eclipse.amp.amf.parameters.aPar.Import
+     * @generated
+     */
   public Adapter createImportAdapter()
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates <em>Incorporates</em>}'.
-   * <!-- begin-user-doc -->
+     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Incorporates <em>Incorporates</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.amp.amf.parameters.aPar.Incorporates
-   * @generated
-   */
+     * @return the new adapter.
+     * @see org.eclipse.amp.amf.parameters.aPar.Incorporates
+     * @generated
+     */
   public Adapter createIncorporatesAdapter()
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Parameter <em>Parameter</em>}'.
-   * <!-- begin-user-doc -->
+     * Creates a new adapter for an object of class '{@link org.eclipse.amp.amf.parameters.aPar.Parameter <em>Parameter</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.amp.amf.parameters.aPar.Parameter
-   * @generated
-   */
+     * @return the new adapter.
+     * @see org.eclipse.amp.amf.parameters.aPar.Parameter
+     * @generated
+     */
   public Adapter createParameterAdapter()
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
+     * Creates a new adapter for the default case.
+     * <!-- begin-user-doc -->
    * This default implementation returns null.
    * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
+     * @return the new adapter.
+     * @generated
+     */
   public Adapter createEObjectAdapter()
   {
-    return null;
-  }
+        return null;
+    }
 
 } //AParAdapterFactory
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParSwitch.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParSwitch.java
index bd07bee..987bc89 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParSwitch.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/util/AParSwitch.java
@@ -28,183 +28,175 @@
 public class AParSwitch<T>
 {
   /**
-   * The cached model package
-   * <!-- begin-user-doc -->
+     * The cached model package
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   protected static AParPackage modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
+     * Creates an instance of the switch.
+     * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
-   */
+     * @generated
+     */
   public AParSwitch()
   {
-    if (modelPackage == null)
-    {
-      modelPackage = AParPackage.eINSTANCE;
+        if (modelPackage == null) {
+            modelPackage = AParPackage.eINSTANCE;
+        }
     }
-  }
 
   /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
+     * 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
-   */
+     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * @generated
+     */
   public T doSwitch(EObject theEObject)
   {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
+        return doSwitch(theEObject.eClass(), theEObject);
+    }
 
   /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
+     * 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
-   */
+     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * @generated
+     */
   protected T doSwitch(EClass theEClass, EObject theEObject)
   {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
+        if (theEClass.eContainer() == modelPackage) {
+            return doSwitch(theEClass.getClassifierID(), theEObject);
+        }
+        else {
+            List<EClass> eSuperTypes = theEClass.getESuperTypes();
+            return
+                eSuperTypes.isEmpty() ?
+                    defaultCase(theEObject) :
+                    doSwitch(eSuperTypes.get(0), theEObject);
+        }
     }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
 
   /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
+     * 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
-   */
+     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * @generated
+     */
   protected T doSwitch(int classifierID, EObject theEObject)
   {
-    switch (classifierID)
-    {
-      case AParPackage.MODEL:
-      {
-        Model model = (Model)theEObject;
-        T result = caseModel(model);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case AParPackage.IMPORT:
-      {
-        Import import_ = (Import)theEObject;
-        T result = caseImport(import_);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case AParPackage.INCORPORATES:
-      {
-        Incorporates incorporates = (Incorporates)theEObject;
-        T result = caseIncorporates(incorporates);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case AParPackage.PARAMETER:
-      {
-        Parameter parameter = (Parameter)theEObject;
-        T result = caseParameter(parameter);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
+        switch (classifierID) {
+            case AParPackage.MODEL: {
+                Model model = (Model)theEObject;
+                T result = caseModel(model);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case AParPackage.IMPORT: {
+                Import import_ = (Import)theEObject;
+                T result = caseImport(import_);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case AParPackage.INCORPORATES: {
+                Incorporates incorporates = (Incorporates)theEObject;
+                T result = caseIncorporates(incorporates);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case AParPackage.PARAMETER: {
+                Parameter parameter = (Parameter)theEObject;
+                T result = caseParameter(parameter);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            default: return defaultCase(theEObject);
+        }
     }
-  }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
-   * <!-- begin-user-doc -->
+     * Returns the result of interpreting the object as an instance of '<em>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.
-   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
+     * @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
+     */
   public T caseModel(Model object)
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Import</em>'.
-   * <!-- begin-user-doc -->
+     * Returns the result of interpreting the object as an instance of '<em>Import</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>Import</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Import</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
   public T caseImport(Import object)
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Incorporates</em>'.
-   * <!-- begin-user-doc -->
+     * Returns the result of interpreting the object as an instance of '<em>Incorporates</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>Incorporates</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Incorporates</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
   public T caseIncorporates(Incorporates object)
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
+     * Returns the result of interpreting the object as an instance of '<em>Parameter</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>Parameter</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
   public T caseParameter(Parameter object)
   {
-    return null;
-  }
+        return null;
+    }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
+     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+     * <!-- begin-user-doc -->
    * 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.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
+     * @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
+     */
   public T defaultCase(EObject object)
   {
-    return null;
-  }
+        return null;
+    }
 
 } //AParSwitch
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ImportValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ImportValidator.java
new file mode 100644
index 0000000..32c4ede
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ImportValidator.java
@@ -0,0 +1,20 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id: ImportValidator.java,v 1.1 2009/11/06 21:26:37 mparker Exp $

+ */

+package org.eclipse.amp.amf.parameters.aPar.validation;

+

+

+/**

+ * A sample validator interface for {@link org.eclipse.amp.amf.parameters.aPar.Import}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface ImportValidator {

+    boolean validate();

+

+    boolean validateImportURI(String value);

+}

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/IncorporatesValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/IncorporatesValidator.java
new file mode 100644
index 0000000..3fe4411
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/IncorporatesValidator.java
@@ -0,0 +1,20 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id: IncorporatesValidator.java,v 1.1 2009/11/06 21:26:37 mparker Exp $

+ */

+package org.eclipse.amp.amf.parameters.aPar.validation;

+

+

+/**

+ * A sample validator interface for {@link org.eclipse.amp.amf.parameters.aPar.Incorporates}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface IncorporatesValidator {

+    boolean validate();

+

+    boolean validateImportURI(String value);

+}

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ModelValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ModelValidator.java
new file mode 100644
index 0000000..105f213
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ModelValidator.java
@@ -0,0 +1,28 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id: ModelValidator.java,v 1.1 2009/11/06 21:26:37 mparker Exp $

+ */

+package org.eclipse.amp.amf.parameters.aPar.validation;

+

+import org.eclipse.amp.amf.parameters.aPar.Import;

+import org.eclipse.amp.amf.parameters.aPar.Incorporates;

+import org.eclipse.amp.amf.parameters.aPar.Parameter;

+

+import org.eclipse.emf.common.util.EList;

+

+/**

+ * A sample validator interface for {@link org.eclipse.amp.amf.parameters.aPar.Model}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface ModelValidator {

+    boolean validate();

+

+    boolean validateName(String value);

+    boolean validateModel(EList<Import> value);

+    boolean validateIncorporates(EList<Incorporates> value);

+    boolean validateParameters(EList<Parameter> value);

+}

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ParameterValidator.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ParameterValidator.java
new file mode 100644
index 0000000..aaf6b63
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/src-gen/org/eclipse/amp/amf/parameters/aPar/validation/ParameterValidator.java
@@ -0,0 +1,24 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id: ParameterValidator.java,v 1.1 2009/11/06 21:26:37 mparker Exp $

+ */

+package org.eclipse.amp.amf.parameters.aPar.validation;

+

+import org.eclipse.amp.amf.abase.aBase.Value;

+

+import org.metaabm.SAttribute;

+

+/**

+ * A sample validator interface for {@link org.eclipse.amp.amf.parameters.aPar.Parameter}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface ParameterValidator {

+    boolean validate();

+

+    boolean validateAttribute(SAttribute value);

+    boolean validateValue(Value value);

+}

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/text/description.txt b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/text/description.txt
index 9fb4701..ec33cf1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/text/description.txt
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/text/description.txt
@@ -21,20 +21,4 @@
 

   Class Parameter

     Reference attribute : SAttribute

-    Reference value : EObject

-

-  Class IntValue

-    Attribute value : EInt

-

-  Class RealValue

-    Attribute value : EString

-

-  Class StringValue

-    Attribute value : EString

-

-  Class BooleanValue

-    Attribute value : BOOLEAN

-

-  Enum BOOLEAN

-    Literal TRUE = 0

-    Literal FALSE = 1

+    Reference value : Value