TDQ-10626 add id attribute in model element and adjust getUUID logic in resource helper

2015-07-09 19:00:56 +08:00
11 changed files with 645 additions and 316 deletions
--- a/main/plugins/org.talend.cwm.mip/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.cwm.mip/META-INF/MANIFEST.MF
@@ -110,5 +110,6 @@ Export-Package: orgomg.cwm.analysis.businessnomenclature,
 orgomg.mof.model.util
 Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.emf.ecore;visibility:=reexport,
- org.apache.log4j
+ org.apache.log4j,
+ org.eclipse.emf.ecore.xmi
 Bundle-ActivationPolicy: lazy
--- a/main/plugins/org.talend.cwm.mip/model/CWM.ecore
+++ b/main/plugins/org.talend.cwm.mip/model/CWM.ecore
@@ -150,6 +150,7 @@
              <details key="documentation" value="Identifies the DASDLProperties that apply to a ModelElement."/>
            </eAnnotations>
          </eStructuralFeatures>
+          <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
        </eClassifiers>
        <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//cwm/objectmodel/core/ModelElement">
          <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/CorePackage.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/CorePackage.java
@@ -341,13 +341,22 @@ public interface CorePackage extends EPackage {
     */
    int MODEL_ELEMENT__DASDL_PROPERTY = ELEMENT_FEATURE_COUNT + 18;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MODEL_ELEMENT__ID = ELEMENT_FEATURE_COUNT + 19;
+
    /**
     * The number of structural features of the '<em>Model Element</em>' class.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @generated
     * @ordered
     */
-    int MODEL_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 19;
+    int MODEL_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 20;

    /**
     * The meta object id for the '{@link orgomg.cwm.objectmodel.core.impl.NamespaceImpl <em>Namespace</em>}' class.
@@ -519,6 +528,15 @@ public interface CorePackage extends EPackage {
     */
    int NAMESPACE__DASDL_PROPERTY = MODEL_ELEMENT__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int NAMESPACE__ID = MODEL_ELEMENT__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -709,6 +727,15 @@ public interface CorePackage extends EPackage {
     */
    int CLASSIFIER__DASDL_PROPERTY = NAMESPACE__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int CLASSIFIER__ID = NAMESPACE__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1022,6 +1049,15 @@ public interface CorePackage extends EPackage {
     */
    int CLASS__DASDL_PROPERTY = CLASSIFIER__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int CLASS__ID = CLASSIFIER__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1345,6 +1381,15 @@ public interface CorePackage extends EPackage {
     */
    int DATA_TYPE__DASDL_PROPERTY = CLASSIFIER__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATA_TYPE__ID = CLASSIFIER__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1659,6 +1704,15 @@ public interface CorePackage extends EPackage {
     */
    int PACKAGE__DASDL_PROPERTY = NAMESPACE__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int PACKAGE__ID = NAMESPACE__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1862,6 +1916,15 @@ public interface CorePackage extends EPackage {
     */
    int SUBSYSTEM__DASDL_PROPERTY = CLASSIFIER__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SUBSYSTEM__ID = CLASSIFIER__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -2192,6 +2255,15 @@ public interface CorePackage extends EPackage {
     */
    int MODEL__DASDL_PROPERTY = PACKAGE__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MODEL__ID = PACKAGE__ID;
+
    /**
     * The feature id for the '<em><b>Owned Element</b></em>' containment reference list.
     * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -2395,6 +2467,15 @@ public interface CorePackage extends EPackage {
     */
    int FEATURE__DASDL_PROPERTY = MODEL_ELEMENT__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FEATURE__ID = MODEL_ELEMENT__ID;
+
    /**
     * The feature id for the '<em><b>Owner Scope</b></em>' attribute. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -2619,6 +2700,15 @@ public interface CorePackage extends EPackage {
     */
    int STRUCTURAL_FEATURE__DASDL_PROPERTY = FEATURE__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STRUCTURAL_FEATURE__ID = FEATURE__ID;
+
    /**
     * The feature id for the '<em><b>Owner Scope</b></em>' attribute. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -2945,6 +3035,15 @@ public interface CorePackage extends EPackage {
     */
    int ATTRIBUTE__DASDL_PROPERTY = STRUCTURAL_FEATURE__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ATTRIBUTE__ID = STRUCTURAL_FEATURE__ID;
+
    /**
     * The feature id for the '<em><b>Owner Scope</b></em>' attribute. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -3283,6 +3382,15 @@ public interface CorePackage extends EPackage {
     */
    int CONSTRAINT__DASDL_PROPERTY = MODEL_ELEMENT__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int CONSTRAINT__ID = MODEL_ELEMENT__ID;
+
    /**
     * The feature id for the '<em><b>Body</b></em>' containment reference. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -3489,6 +3597,15 @@ public interface CorePackage extends EPackage {
     */
    int DEPENDENCY__DASDL_PROPERTY = MODEL_ELEMENT__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DEPENDENCY__ID = MODEL_ELEMENT__ID;
+
    /**
     * The feature id for the '<em><b>Kind</b></em>' attribute. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -3879,6 +3996,15 @@ public interface CorePackage extends EPackage {
     */
    int STEREOTYPE__DASDL_PROPERTY = MODEL_ELEMENT__DASDL_PROPERTY;

+    /**
+     * The feature id for the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STEREOTYPE__ID = MODEL_ELEMENT__ID;
+
    /**
     * The feature id for the '<em><b>Base Class</b></em>' attribute. <!--
     * begin-user-doc --> <!-- end-user-doc -->
@@ -4315,6 +4441,17 @@ public interface CorePackage extends EPackage {
     */
    EReference getModelElement_DasdlProperty();

+    /**
+     * Returns the meta object for the attribute '{@link orgomg.cwm.objectmodel.core.ModelElement#getId <em>Id</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Id</em>'.
+     * @see orgomg.cwm.objectmodel.core.ModelElement#getId()
+     * @see #getModelElement()
+     * @generated
+     */
+    EAttribute getModelElement_Id();
+
    /**
     * Returns the meta object for class '
     * {@link orgomg.cwm.objectmodel.core.Namespace <em>Namespace</em>}'. <!--
@@ -5418,6 +5555,14 @@ public interface CorePackage extends EPackage {
         */
        EReference MODEL_ELEMENT__DASDL_PROPERTY = eINSTANCE.getModelElement_DasdlProperty();

+        /**
+         * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute MODEL_ELEMENT__ID = eINSTANCE.getModelElement_Id();
+
        /**
         * The meta object literal for the '
         * {@link orgomg.cwm.objectmodel.core.impl.NamespaceImpl
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/ModelElement.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/ModelElement.java
@@ -18,37 +18,36 @@ import orgomg.cwm.management.warehouseoperation.Measurement;
 import orgomg.cwmx.resource.dmsii.DASDLProperty;

 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Model Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Model Element</b></em>'. <!-- end-user-doc -->
 *
- * <!-- begin-model-doc -->
- * A model element is an element that is an abstraction drawn from the system being modeled.
+ * <!-- begin-model-doc --> A model element is an element that is an abstraction drawn from the system being modeled.
 * 
- * In the metamodel, a ModelElement is a named entity in a Model. It is the base for all modeling metaclasses in the CWM. All other modeling metaclasses are either direct or indirect subclasses of ModelElement.
- * <!-- end-model-doc -->
+ * In the metamodel, a ModelElement is a named entity in a Model. It is the base for all modeling metaclasses in the
+ * CWM. All other modeling metaclasses are either direct or indirect subclasses of ModelElement. <!-- end-model-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getName <em>Name</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getClientDependency <em>Client Dependency</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getSupplierDependency <em>Supplier Dependency</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getConstraint <em>Constraint</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getImporter <em>Importer</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getStereotype <em>Stereotype</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getTaggedValue <em>Tagged Value</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDocument <em>Document</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDescription <em>Description</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getResponsibleParty <em>Responsible Party</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getElementNode <em>Element Node</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getSet <em>Set</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getRenderedObject <em>Rendered Object</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getVocabularyElement <em>Vocabulary Element</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getMeasurement <em>Measurement</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getChangeRequest <em>Change Request</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDasdlProperty <em>Dasdl Property</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getName <em>Name</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getClientDependency <em>Client Dependency</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getSupplierDependency <em>Supplier Dependency</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getConstraint <em>Constraint</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getNamespace <em>Namespace</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getImporter <em>Importer</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getTaggedValue <em>Tagged Value</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDocument <em>Document</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDescription <em>Description</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getResponsibleParty <em>Responsible Party</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getElementNode <em>Element Node</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getSet <em>Set</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getRenderedObject <em>Rendered Object</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getVocabularyElement <em>Vocabulary Element</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getChangeRequest <em>Change Request</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getDasdlProperty <em>Dasdl Property</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.ModelElement#getId <em>Id</em>}</li>
 * </ul>
 * </p>
 *
@@ -59,23 +58,22 @@ import orgomg.cwmx.resource.dmsii.DASDLProperty;
 public interface ModelElement extends Element {

    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> An
-     * identifier for the ModelElement within its containing Namespace. <!--
-     * end-model-doc -->
+     * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> An identifier for the ModelElement within its containing Namespace. <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Name</em>' attribute.
     * @see #setName(String)
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Name()
     * @model dataType="orgomg.cwm.objectmodel.core.Name"
-     *        annotation="htttp://talend.org/UiConstraints string.max.size='255'"
+     * annotation="htttp://talend.org/UiConstraints string.max.size='255'"
     * @generated
     */
    String getName();

    /**
-     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#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
@@ -83,11 +81,9 @@ public interface ModelElement extends Element {
    void setName(String value);

    /**
-     * Returns the value of the '<em><b>Visibility</b></em>' attribute. The
-     * literals are from the enumeration
-     * {@link orgomg.cwm.objectmodel.core.VisibilityKind}. <!-- begin-user-doc
-     * --> <!-- end-user-doc --> <!-- begin-model-doc --> Specifies extent of
-     * the visibility of the ModelElement within its owning Namespace. <!--
+     * Returns the value of the '<em><b>Visibility</b></em>' attribute. The literals are from the enumeration
+     * {@link orgomg.cwm.objectmodel.core.VisibilityKind}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> Specifies extent of the visibility of the ModelElement within its owning Namespace. <!--
     * end-model-doc -->
     * 
     * @return the value of the '<em>Visibility</em>' attribute.
@@ -100,9 +96,9 @@ public interface ModelElement extends Element {
    VisibilityKind getVisibility();

    /**
-     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getVisibility <em>Visibility</em>}' attribute.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getVisibility <em>Visibility</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @param value the new value of the '<em>Visibility</em>' attribute.
     * @see orgomg.cwm.objectmodel.core.VisibilityKind
     * @see #getVisibility()
@@ -111,13 +107,11 @@ public interface ModelElement extends Element {
    void setVisibility(VisibilityKind value);

    /**
-     * Returns the value of the '<em><b>Client Dependency</b></em>' reference
-     * list. The list contents are of type
-     * {@link orgomg.cwm.objectmodel.core.Dependency}. It is bidirectional and
-     * its opposite is '{@link orgomg.cwm.objectmodel.core.Dependency#getClient
-     * <em>Client</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-     * begin-model-doc --> Identifies Dependency instances in which the
-     * ModelElement acts as a client. <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Client Dependency</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.objectmodel.core.Dependency}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.Dependency#getClient <em>Client</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc --> <!-- begin-model-doc --> Identifies Dependency instances in which the ModelElement acts as a
+     * client. <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Client Dependency</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_ClientDependency()
@@ -128,15 +122,11 @@ public interface ModelElement extends Element {
    EList<Dependency> getClientDependency();

    /**
-     * Returns the value of the '<em><b>Supplier Dependency</b></em>' reference
-     * list. The list contents are of type
-     * {@link orgomg.cwm.objectmodel.core.Dependency}. It is bidirectional and
-     * its opposite is '
-     * {@link orgomg.cwm.objectmodel.core.Dependency#getSupplier
-     * <em>Supplier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-     * begin-model-doc --> The DependencySupplier association links Dependency
-     * instances with ModelElements that act as suppliers in the represented
-     * dependency relationship. <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Supplier Dependency</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.objectmodel.core.Dependency}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.Dependency#getSupplier <em>Supplier</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc --> <!-- begin-model-doc --> The DependencySupplier association links Dependency instances with
+     * ModelElements that act as suppliers in the represented dependency relationship. <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Supplier Dependency</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_SupplierDependency()
@@ -147,14 +137,11 @@ public interface ModelElement extends Element {
    EList<Dependency> getSupplierDependency();

    /**
-     * Returns the value of the '<em><b>Constraint</b></em>' reference list. The
-     * list contents are of type {@link orgomg.cwm.objectmodel.core.Constraint}.
-     * It is bidirectional and its opposite is '
-     * {@link orgomg.cwm.objectmodel.core.Constraint#getConstrainedElement
-     * <em>Constrained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * --> <!-- begin-model-doc --> Identifies the Constraint instances that
-     * restrict the possible states that a ModelElement may take. <!--
-     * end-model-doc -->
+     * Returns the value of the '<em><b>Constraint</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.objectmodel.core.Constraint}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.Constraint#getConstrainedElement <em>Constrained Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Constraint instances that
+     * restrict the possible states that a ModelElement may take. <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Constraint</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Constraint()
@@ -165,12 +152,11 @@ public interface ModelElement extends Element {
    EList<Constraint> getConstraint();

    /**
-     * Returns the value of the '<em><b>Namespace</b></em>' container reference.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.objectmodel.core.Namespace#getOwnedElement <em>Owned Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the Namespace, if any, that owns the ModelElement.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Namespace</b></em>' container reference. It is bidirectional and its opposite is
+     * '{@link orgomg.cwm.objectmodel.core.Namespace#getOwnedElement <em>Owned Element</em>}'. <!-- begin-user-doc -->
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Namespace, if any, that owns the ModelElement. <!--
+     * end-model-doc -->
+     * 
     * @return the value of the '<em>Namespace</em>' container reference.
     * @see #setNamespace(Namespace)
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Namespace()
@@ -181,9 +167,9 @@ public interface ModelElement extends Element {
    Namespace getNamespace();

    /**
-     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getNamespace <em>Namespace</em>}' container reference.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getNamespace <em>Namespace</em>}'
+     * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @param value the new value of the '<em>Namespace</em>' container reference.
     * @see #getNamespace()
     * @generated
@@ -191,13 +177,11 @@ public interface ModelElement extends Element {
    void setNamespace(Namespace value);

    /**
-     * Returns the value of the '<em><b>Importer</b></em>' reference list. The
-     * list contents are of type {@link orgomg.cwm.objectmodel.core.Package}. It
-     * is bidirectional and its opposite is '
-     * {@link orgomg.cwm.objectmodel.core.Package#getImportedElement
-     * <em>Imported Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * --> <!-- begin-model-doc --> Identifies the Packages that import a
-     * ModelElement. <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Importer</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.objectmodel.core.Package}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.Package#getImportedElement <em>Imported Element</em>}'. <!-- begin-user-doc
+     * --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Packages that import a ModelElement. <!--
+     * end-model-doc -->
     * 
     * @return the value of the '<em>Importer</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Importer()
@@ -208,12 +192,10 @@ public interface ModelElement extends Element {
    EList<orgomg.cwm.objectmodel.core.Package> getImporter();

    /**
-     * Returns the value of the '<em><b>Stereotype</b></em>' reference. It is
-     * bidirectional and its opposite is '
-     * {@link orgomg.cwm.objectmodel.core.Stereotype#getExtendedElement
-     * <em>Extended Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * --> <!-- begin-model-doc --> Identifies the Stereotype instance that
-     * further defines the semantics of the ModelElement. <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Stereotype</b></em>' reference. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.Stereotype#getExtendedElement <em>Extended Element</em>}'. <!-- begin-user-doc
+     * --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Stereotype instance that further defines the
+     * semantics of the ModelElement. <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Stereotype</em>' reference.
     * @see #setStereotype(Stereotype)
@@ -225,9 +207,9 @@ public interface ModelElement extends Element {
    Stereotype getStereotype();

    /**
-     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getStereotype <em>Stereotype</em>}' reference.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getStereotype <em>Stereotype</em>}'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @param value the new value of the '<em>Stereotype</em>' reference.
     * @see #getStereotype()
     * @generated
@@ -235,30 +217,28 @@ public interface ModelElement extends Element {
    void setStereotype(Stereotype value);

    /**
-     * Returns the value of the '<em><b>Tagged Value</b></em>' containment reference list.
-     * The list contents are of type {@link orgomg.cwm.objectmodel.core.TaggedValue}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.objectmodel.core.TaggedValue#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the set of TaggedValue instances that extend a ModelElement.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Tagged Value</b></em>' containment reference list. The list contents are of type
+     * {@link orgomg.cwm.objectmodel.core.TaggedValue}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.objectmodel.core.TaggedValue#getModelElement <em>Model Element</em>}'. <!-- begin-user-doc -->
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the set of TaggedValue instances that extend a
+     * ModelElement. <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Tagged Value</em>' containment reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_TaggedValue()
     * @see orgomg.cwm.objectmodel.core.TaggedValue#getModelElement
-     * @model opposite="modelElement" containment="true"
-     *        annotation="htttp://talend.org/UiConstraints string.max.size.Description='1000' string.max.size.Purpose='255' string.max.size.Author='255'"
+     * @model opposite="modelElement" containment="true" annotation=
+     * "htttp://talend.org/UiConstraints string.max.size.Description='1000' string.max.size.Purpose='255' string.max.size.Author='255'"
     * @generated
     */
    EList<TaggedValue> getTaggedValue();

    /**
-     * Returns the value of the '<em><b>Document</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.foundation.businessinformation.Document}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.foundation.businessinformation.Document#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the Document instances relevant to a particular ModelElement.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Document</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.foundation.businessinformation.Document}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.foundation.businessinformation.Document#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Document instances relevant to a
+     * particular ModelElement. <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Document</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Document()
     * @see orgomg.cwm.foundation.businessinformation.Document#getModelElement
@@ -268,13 +248,12 @@ public interface ModelElement extends Element {
    EList<Document> getDocument();

    /**
-     * Returns the value of the '<em><b>Description</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.foundation.businessinformation.Description}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.foundation.businessinformation.Description#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the Description instances relevant for a particular ModelElement instance.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Description</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.foundation.businessinformation.Description}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.foundation.businessinformation.Description#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the Description instances relevant
+     * for a particular ModelElement instance. <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Description</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Description()
     * @see orgomg.cwm.foundation.businessinformation.Description#getModelElement
@@ -284,13 +263,12 @@ public interface ModelElement extends Element {
    EList<Description> getDescription();

    /**
-     * Returns the value of the '<em><b>Responsible Party</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.foundation.businessinformation.ResponsibleParty}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.foundation.businessinformation.ResponsibleParty#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the ResponsibleParty instances relevant for a particular ModelElement instance.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Responsible Party</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.foundation.businessinformation.ResponsibleParty}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.foundation.businessinformation.ResponsibleParty#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the ResponsibleParty instances
+     * relevant for a particular ModelElement instance. <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Responsible Party</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_ResponsibleParty()
     * @see orgomg.cwm.foundation.businessinformation.ResponsibleParty#getModelElement
@@ -300,13 +278,12 @@ public interface ModelElement extends Element {
    EList<ResponsibleParty> getResponsibleParty();

    /**
-     * Returns the value of the '<em><b>Element Node</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.foundation.expressions.ElementNode}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.foundation.expressions.ElementNode#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies the ElementNode instances that represent a particular ModelElement in expressions.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Element Node</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.foundation.expressions.ElementNode}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.foundation.expressions.ElementNode#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the ElementNode instances that
+     * represent a particular ModelElement in expressions. <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Element Node</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_ElementNode()
     * @see orgomg.cwm.foundation.expressions.ElementNode#getModelElement
@@ -316,13 +293,10 @@ public interface ModelElement extends Element {
    EList<ElementNode> getElementNode();

    /**
-     * Returns the value of the '<em><b>Set</b></em>' reference list. The list
-     * contents are of type
-     * {@link orgomg.cwm.analysis.transformation.DataObjectSet}. It is
-     * bidirectional and its opposite is '
-     * {@link orgomg.cwm.analysis.transformation.DataObjectSet#getElement
-     * <em>Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-     * begin-model-doc --> Identifies the DataObjectSet <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Set</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.analysis.transformation.DataObjectSet}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.analysis.transformation.DataObjectSet#getElement <em>Element</em>}'. <!-- begin-user-doc -->
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Identifies the DataObjectSet <!-- end-model-doc -->
     * 
     * @return the value of the '<em>Set</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Set()
@@ -333,13 +307,12 @@ public interface ModelElement extends Element {
    EList<DataObjectSet> getSet();

    /**
-     * Returns the value of the '<em><b>Rendered Object</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.analysis.informationvisualization.RenderedObject}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.analysis.informationvisualization.RenderedObject#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Rendered Objects referencing the Model Element.
+     * Returns the value of the '<em><b>Rendered Object</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.analysis.informationvisualization.RenderedObject}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.analysis.informationvisualization.RenderedObject#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Rendered Objects referencing the Model Element.
     * <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Rendered Object</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_RenderedObject()
     * @see orgomg.cwm.analysis.informationvisualization.RenderedObject#getModelElement
@@ -349,13 +322,12 @@ public interface ModelElement extends Element {
    EList<RenderedObject> getRenderedObject();

    /**
-     * Returns the value of the '<em><b>Vocabulary Element</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.analysis.businessnomenclature.VocabularyElement}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.analysis.businessnomenclature.VocabularyElement#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies a VocabularyElement.
-     * <!-- end-model-doc -->
+     * Returns the value of the '<em><b>Vocabulary Element</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.analysis.businessnomenclature.VocabularyElement}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.analysis.businessnomenclature.VocabularyElement#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies a VocabularyElement. <!--
+     * end-model-doc -->
+     * 
     * @return the value of the '<em>Vocabulary Element</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_VocabularyElement()
     * @see orgomg.cwm.analysis.businessnomenclature.VocabularyElement#getModelElement
@@ -365,13 +337,12 @@ public interface ModelElement extends Element {
    EList<VocabularyElement> getVocabularyElement();

    /**
-     * Returns the value of the '<em><b>Measurement</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.management.warehouseoperation.Measurement}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.management.warehouseoperation.Measurement#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies a Measurement for a ModelElement.
+     * Returns the value of the '<em><b>Measurement</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.management.warehouseoperation.Measurement}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.management.warehouseoperation.Measurement#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies a Measurement for a ModelElement.
     * <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Measurement</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Measurement()
     * @see orgomg.cwm.management.warehouseoperation.Measurement#getModelElement
@@ -381,13 +352,12 @@ public interface ModelElement extends Element {
    EList<Measurement> getMeasurement();

    /**
-     * Returns the value of the '<em><b>Change Request</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwm.management.warehouseoperation.ChangeRequest}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwm.management.warehouseoperation.ChangeRequest#getModelElement <em>Model Element</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * <!-- begin-model-doc -->
-     * Identifies a ChangeRequest for a ModelElement.
+     * Returns the value of the '<em><b>Change Request</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwm.management.warehouseoperation.ChangeRequest}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwm.management.warehouseoperation.ChangeRequest#getModelElement <em>Model Element</em>}'. <!--
+     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Identifies a ChangeRequest for a ModelElement.
     * <!-- end-model-doc -->
+     * 
     * @return the value of the '<em>Change Request</em>' reference list.
     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_ChangeRequest()
     * @see orgomg.cwm.management.warehouseoperation.ChangeRequest#getModelElement
@@ -397,13 +367,10 @@ public interface ModelElement extends Element {
    EList<ChangeRequest> getChangeRequest();

    /**
-     * Returns the value of the '<em><b>Dasdl Property</b></em>' reference list.
-     * The list contents are of type
-     * {@link orgomg.cwmx.resource.dmsii.DASDLProperty}. It is bidirectional and
-     * its opposite is '
-     * {@link orgomg.cwmx.resource.dmsii.DASDLProperty#getOwner <em>Owner</em>}
-     * '. <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
-     * Identifies the DASDLProperties that apply to a ModelElement. <!--
+     * Returns the value of the '<em><b>Dasdl Property</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwmx.resource.dmsii.DASDLProperty}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwmx.resource.dmsii.DASDLProperty#getOwner <em>Owner</em>} '. <!-- begin-user-doc --> <!--
+     * end-user-doc --> <!-- begin-model-doc --> Identifies the DASDLProperties that apply to a ModelElement. <!--
     * end-model-doc -->
     * 
     * @return the value of the '<em>Dasdl Property</em>' reference list.
@@ -414,4 +381,29 @@ public interface ModelElement extends Element {
     */
    EList<DASDLProperty> getDasdlProperty();

+    /**
+     * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>Id</em>' attribute.
+     * @see #setId(String)
+     * @see orgomg.cwm.objectmodel.core.CorePackage#getModelElement_Id()
+     * @model
+     * @generated
+     */
+    String getId();
+
+    /**
+     * Sets the value of the '{@link orgomg.cwm.objectmodel.core.ModelElement#getId <em>Id</em>}' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @param value the new value of the '<em>Id</em>' attribute.
+     * @see #getId()
+     * @generated
+     */
+    void setId(String value);
+
 } // ModelElement
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/CoreFactoryImpl.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/CoreFactoryImpl.java
@@ -46,8 +46,7 @@ public class CoreFactoryImpl extends EFactoryImpl implements CoreFactory {
     */
    public static CoreFactory init() {
        try {
-            CoreFactory theCoreFactory = (CoreFactory) EPackage.Registry.INSTANCE
-                    .getEFactory("http:///orgomg/cwm/objectmodel/core.ecore");
+            CoreFactory theCoreFactory = (CoreFactory) EPackage.Registry.INSTANCE.getEFactory(CorePackage.eNS_URI);
            if (theCoreFactory != null) {
                return theCoreFactory;
            }
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/CorePackageImpl.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/CorePackageImpl.java
@@ -709,6 +709,15 @@ public class CorePackageImpl extends EPackageImpl implements CorePackage {
        return (EReference) modelElementEClass.getEStructuralFeatures().get(18);
    }

+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getModelElement_Id() {
+        return (EAttribute) modelElementEClass.getEStructuralFeatures().get(19);
+    }
+
    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @generated
@@ -1462,6 +1471,7 @@ public class CorePackageImpl extends EPackageImpl implements CorePackage {
        createEReference(modelElementEClass, MODEL_ELEMENT__MEASUREMENT);
        createEReference(modelElementEClass, MODEL_ELEMENT__CHANGE_REQUEST);
        createEReference(modelElementEClass, MODEL_ELEMENT__DASDL_PROPERTY);
+        createEAttribute(modelElementEClass, MODEL_ELEMENT__ID);

        namespaceEClass = createEClass(NAMESPACE);
        createEReference(namespaceEClass, NAMESPACE__OWNED_ELEMENT);
@@ -1725,6 +1735,8 @@ public class CorePackageImpl extends EPackageImpl implements CorePackage {
                theDmsiiPackage.getDASDLProperty_Owner(), "dasdlProperty", null, 0, -1, ModelElement.class, !IS_TRANSIENT,
                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
                IS_ORDERED);
+        initEAttribute(getModelElement_Id(), ecorePackage.getEString(), "id", null, 0, 1, ModelElement.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

        initEClass(namespaceEClass, Namespace.class, "Namespace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
        initEReference(getNamespace_OwnedElement(), this.getModelElement(), this.getModelElement_Namespace(), "ownedElement",
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/ModelElementImpl.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/impl/ModelElementImpl.java
@@ -13,10 +13,12 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.ecore.xmi.XMLResource;
 import orgomg.cwm.analysis.businessnomenclature.BusinessnomenclaturePackage;
 import orgomg.cwm.analysis.businessnomenclature.VocabularyElement;
 import orgomg.cwm.analysis.informationvisualization.InformationvisualizationPackage;
@@ -44,30 +46,30 @@ import orgomg.cwmx.resource.dmsii.DASDLProperty;
 import orgomg.cwmx.resource.dmsii.DmsiiPackage;

 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Model Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Model Element</b></em>'. <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * <ul>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getName <em>Name</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getClientDependency <em>Client Dependency</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getSupplierDependency <em>Supplier Dependency</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getConstraint <em>Constraint</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getImporter <em>Importer</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getStereotype <em>Stereotype</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getTaggedValue <em>Tagged Value</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDocument <em>Document</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getResponsibleParty <em>Responsible Party</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getElementNode <em>Element Node</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getSet <em>Set</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getRenderedObject <em>Rendered Object</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getVocabularyElement <em>Vocabulary Element</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getMeasurement <em>Measurement</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getChangeRequest <em>Change Request</em>}</li>
- *   <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDasdlProperty <em>Dasdl Property</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getClientDependency <em>Client Dependency</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getSupplierDependency <em>Supplier Dependency</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getConstraint <em>Constraint</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getNamespace <em>Namespace</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getImporter <em>Importer</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getTaggedValue <em>Tagged Value</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDocument <em>Document</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getResponsibleParty <em>Responsible Party</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getElementNode <em>Element Node</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getSet <em>Set</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getRenderedObject <em>Rendered Object</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getVocabularyElement <em>Vocabulary Element</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getMeasurement <em>Measurement</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getChangeRequest <em>Change Request</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getDasdlProperty <em>Dasdl Property</em>}</li>
+ * <li>{@link orgomg.cwm.objectmodel.core.impl.ModelElementImpl#getId <em>Id</em>}</li>
 * </ul>
 * </p>
 *
@@ -76,8 +78,9 @@ import orgomg.cwmx.resource.dmsii.DmsiiPackage;
 public abstract class ModelElementImpl extends ElementImpl implements ModelElement {

    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
     * @see #getName()
     * @generated
     * @ordered
@@ -85,8 +88,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected static final String NAME_EDEFAULT = null;

    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
     * @see #getName()
     * @generated
     * @ordered
@@ -94,8 +98,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected String name = NAME_EDEFAULT;

    /**
-     * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getVisibility()
     * @generated
     * @ordered
@@ -103,8 +108,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.VK_PUBLIC;

    /**
-     * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getVisibility()
     * @generated
     * @ordered
@@ -112,9 +118,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected VisibilityKind visibility = VISIBILITY_EDEFAULT;

    /**
-     * The cached value of the '{@link #getClientDependency() <em>Client Dependency</em>}' reference list.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * The cached value of the '{@link #getClientDependency() <em>Client Dependency</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getClientDependency()
     * @generated
     * @ordered
@@ -122,9 +128,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Dependency> clientDependency;

    /**
-     * The cached value of the '{@link #getSupplierDependency() <em>Supplier Dependency</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getSupplierDependency() <em>Supplier Dependency</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getSupplierDependency()
     * @generated
     * @ordered
@@ -132,8 +138,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Dependency> supplierDependency;

    /**
-     * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
     * @see #getConstraint()
     * @generated
     * @ordered
@@ -141,8 +148,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Constraint> constraint;

    /**
-     * The cached value of the '{@link #getImporter() <em>Importer</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getImporter() <em>Importer</em>}' reference list. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getImporter()
     * @generated
     * @ordered
@@ -150,8 +158,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<orgomg.cwm.objectmodel.core.Package> importer;

    /**
-     * The cached value of the '{@link #getStereotype() <em>Stereotype</em>}' reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getStereotype() <em>Stereotype</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getStereotype()
     * @generated
     * @ordered
@@ -159,8 +168,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected Stereotype stereotype;

    /**
-     * The cached value of the '{@link #getTaggedValue() <em>Tagged Value</em>}' containment reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getTaggedValue() <em>Tagged Value</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getTaggedValue()
     * @generated
     * @ordered
@@ -168,8 +178,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<TaggedValue> taggedValue;

    /**
-     * The cached value of the '{@link #getDocument() <em>Document</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getDocument() <em>Document</em>}' reference list. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getDocument()
     * @generated
     * @ordered
@@ -177,8 +188,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Document> document;

    /**
-     * The cached value of the '{@link #getDescription() <em>Description</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getDescription() <em>Description</em>}' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
     * @see #getDescription()
     * @generated
     * @ordered
@@ -186,9 +198,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Description> description;

    /**
-     * The cached value of the '{@link #getResponsibleParty() <em>Responsible Party</em>}' reference list.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * The cached value of the '{@link #getResponsibleParty() <em>Responsible Party</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getResponsibleParty()
     * @generated
     * @ordered
@@ -196,8 +208,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<ResponsibleParty> responsibleParty;

    /**
-     * The cached value of the '{@link #getElementNode() <em>Element Node</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getElementNode() <em>Element Node</em>}' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
     * @see #getElementNode()
     * @generated
     * @ordered
@@ -205,8 +218,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<ElementNode> elementNode;

    /**
-     * The cached value of the '{@link #getSet() <em>Set</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getSet() <em>Set</em>}' reference list. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
     * @see #getSet()
     * @generated
     * @ordered
@@ -214,9 +228,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<DataObjectSet> set;

    /**
-     * The cached value of the '{@link #getRenderedObject() <em>Rendered Object</em>}' reference list.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * The cached value of the '{@link #getRenderedObject() <em>Rendered Object</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getRenderedObject()
     * @generated
     * @ordered
@@ -224,9 +238,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<RenderedObject> renderedObject;

    /**
-     * The cached value of the '{@link #getVocabularyElement() <em>Vocabulary Element</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getVocabularyElement() <em>Vocabulary Element</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getVocabularyElement()
     * @generated
     * @ordered
@@ -234,8 +248,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<VocabularyElement> vocabularyElement;

    /**
-     * The cached value of the '{@link #getMeasurement() <em>Measurement</em>}' reference list.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The cached value of the '{@link #getMeasurement() <em>Measurement</em>}' reference list. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
     * @see #getMeasurement()
     * @generated
     * @ordered
@@ -243,9 +258,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<Measurement> measurement;

    /**
-     * The cached value of the '{@link #getChangeRequest() <em>Change Request</em>}' reference list.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * The cached value of the '{@link #getChangeRequest() <em>Change Request</em>}' reference list. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
     * @see #getChangeRequest()
     * @generated
     * @ordered
@@ -253,17 +268,36 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
    protected EList<ChangeRequest> changeRequest;

    /**
-     * The cached value of the '{@link #getDasdlProperty() <em>Dasdl Property</em>}' reference list.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
+     * The cached value of the '{@link #getDasdlProperty() <em>Dasdl Property</em>}' reference list. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
     * @see #getDasdlProperty()
     * @generated
     * @ordered
     */
    protected EList<DASDLProperty> dasdlProperty;

+    /**
+     * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getId()
+     * @generated
+     * @ordered
+     */
+    protected static final String ID_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getId()
+     * @generated
+     * @ordered
+     */
+    protected String id = ID_EDEFAULT;
+
    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    protected ModelElementImpl() {
@@ -272,6 +306,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -281,47 +316,59 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public String getName() {
        return name;
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public void setName(String newName) {
        String oldName = name;
        name = newName;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
            eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__NAME, oldName, name));
+        }
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public VisibilityKind getVisibility() {
        return visibility;
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public void setVisibility(VisibilityKind newVisibility) {
        VisibilityKind oldVisibility = visibility;
        visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
            eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__VISIBILITY, oldVisibility,
                    visibility));
+        }
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Dependency> getClientDependency() {
        if (clientDependency == null) {
            clientDependency = new EObjectWithInverseResolvingEList.ManyInverse<Dependency>(Dependency.class, this,
@@ -332,8 +379,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Dependency> getSupplierDependency() {
        if (supplierDependency == null) {
            supplierDependency = new EObjectWithInverseResolvingEList.ManyInverse<Dependency>(Dependency.class, this,
@@ -344,8 +393,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Constraint> getConstraint() {
        if (constraint == null) {
            constraint = new EObjectWithInverseResolvingEList.ManyInverse<Constraint>(Constraint.class, this,
@@ -356,16 +407,20 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public Namespace getNamespace() {
-        if (eContainerFeatureID() != CorePackage.MODEL_ELEMENT__NAMESPACE)
+        if (eContainerFeatureID() != CorePackage.MODEL_ELEMENT__NAMESPACE) {
            return null;
-        return (Namespace) eContainer();
+        }
+        return (Namespace) eInternalContainer();
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    public NotificationChain basicSetNamespace(Namespace newNamespace, NotificationChain msgs) {
@@ -375,31 +430,40 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public void setNamespace(Namespace newNamespace) {
        if (newNamespace != eInternalContainer()
                || (eContainerFeatureID() != CorePackage.MODEL_ELEMENT__NAMESPACE && newNamespace != null)) {
-            if (EcoreUtil.isAncestor(this, newNamespace))
+            if (EcoreUtil.isAncestor(this, newNamespace)) {
                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+            }
            NotificationChain msgs = null;
-            if (eInternalContainer() != null)
+            if (eInternalContainer() != null) {
                msgs = eBasicRemoveFromContainer(msgs);
-            if (newNamespace != null)
+            }
+            if (newNamespace != null) {
                msgs = ((InternalEObject) newNamespace).eInverseAdd(this, CorePackage.NAMESPACE__OWNED_ELEMENT, Namespace.class,
                        msgs);
+            }
            msgs = basicSetNamespace(newNamespace, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
            eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__NAMESPACE, newNamespace,
                    newNamespace));
+        }
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<orgomg.cwm.objectmodel.core.Package> getImporter() {
        if (importer == null) {
            importer = new EObjectWithInverseResolvingEList.ManyInverse<orgomg.cwm.objectmodel.core.Package>(
@@ -411,16 +475,19 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public Stereotype getStereotype() {
        if (stereotype != null && stereotype.eIsProxy()) {
            InternalEObject oldStereotype = (InternalEObject) stereotype;
            stereotype = (Stereotype) eResolveProxy(oldStereotype);
            if (stereotype != oldStereotype) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, CorePackage.MODEL_ELEMENT__STEREOTYPE,
                            oldStereotype, stereotype));
+                }
            }
        }
        return stereotype;
@@ -428,6 +495,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    public Stereotype basicGetStereotype() {
@@ -436,6 +504,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    public NotificationChain basicSetStereotype(Stereotype newStereotype, NotificationChain msgs) {
@@ -444,39 +513,48 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
        if (eNotificationRequired()) {
            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__STEREOTYPE,
                    oldStereotype, newStereotype);
-            if (msgs == null)
+            if (msgs == null) {
                msgs = notification;
-            else
+            } else {
                msgs.add(notification);
+            }
        }
        return msgs;
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public void setStereotype(Stereotype newStereotype) {
        if (newStereotype != stereotype) {
            NotificationChain msgs = null;
-            if (stereotype != null)
+            if (stereotype != null) {
                msgs = ((InternalEObject) stereotype).eInverseRemove(this, CorePackage.STEREOTYPE__EXTENDED_ELEMENT,
                        Stereotype.class, msgs);
-            if (newStereotype != null)
+            }
+            if (newStereotype != null) {
                msgs = ((InternalEObject) newStereotype).eInverseAdd(this, CorePackage.STEREOTYPE__EXTENDED_ELEMENT,
                        Stereotype.class, msgs);
+            }
            msgs = basicSetStereotype(newStereotype, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
            eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__STEREOTYPE, newStereotype,
                    newStereotype));
+        }
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<TaggedValue> getTaggedValue() {
        if (taggedValue == null) {
            taggedValue = new EObjectContainmentWithInverseEList<TaggedValue>(TaggedValue.class, this,
@@ -487,8 +565,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Document> getDocument() {
        if (document == null) {
            document = new EObjectWithInverseResolvingEList.ManyInverse<Document>(Document.class, this,
@@ -499,8 +579,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Description> getDescription() {
        if (description == null) {
            description = new EObjectWithInverseResolvingEList.ManyInverse<Description>(Description.class, this,
@@ -511,8 +593,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ResponsibleParty> getResponsibleParty() {
        if (responsibleParty == null) {
            responsibleParty = new EObjectWithInverseResolvingEList.ManyInverse<ResponsibleParty>(ResponsibleParty.class, this,
@@ -523,8 +607,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ElementNode> getElementNode() {
        if (elementNode == null) {
            elementNode = new EObjectWithInverseResolvingEList<ElementNode>(ElementNode.class, this,
@@ -535,8 +621,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<DataObjectSet> getSet() {
        if (set == null) {
            set = new EObjectWithInverseResolvingEList.ManyInverse<DataObjectSet>(DataObjectSet.class, this,
@@ -547,8 +635,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<RenderedObject> getRenderedObject() {
        if (renderedObject == null) {
            renderedObject = new EObjectWithInverseResolvingEList<RenderedObject>(RenderedObject.class, this,
@@ -559,8 +649,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<VocabularyElement> getVocabularyElement() {
        if (vocabularyElement == null) {
            vocabularyElement = new EObjectWithInverseResolvingEList.ManyInverse<VocabularyElement>(VocabularyElement.class,
@@ -572,8 +664,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<Measurement> getMeasurement() {
        if (measurement == null) {
            measurement = new EObjectWithInverseResolvingEList<Measurement>(Measurement.class, this,
@@ -584,8 +678,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ChangeRequest> getChangeRequest() {
        if (changeRequest == null) {
            changeRequest = new EObjectWithInverseResolvingEList.ManyInverse<ChangeRequest>(ChangeRequest.class, this,
@@ -596,8 +692,10 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<DASDLProperty> getDasdlProperty() {
        if (dasdlProperty == null) {
            dasdlProperty = new EObjectWithInverseResolvingEList<DASDLProperty>(DASDLProperty.class, this,
@@ -606,8 +704,49 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
        return dasdlProperty;
    }

+    /**
+     * <!-- begin-user-doc --> Id represents the unique model in bussiness word, it distinguishes with UUID that it
+     * identifies unique businuss object but UUID identifies an object instance technially. <!-- end-user-doc -->
+     * 
+     * @generated NOT
+     */
+    @Override
+    public String getId() {
+        if (id == null || "".equals(id.trim())) {
+            id = getUUID();
+        }
+        return id;
+    }
+
+    private String getUUID() {
+        if (eIsProxy()) {
+            return ((InternalEObject) this).eProxyURI().fragment();
+        }
+        Resource resource = eResource();
+        if (resource == null || !(resource instanceof XMLResource)) {
+            return null;
+        }
+        XMLResource xmlResource = (XMLResource) resource;
+        return xmlResource.getID(this);
+    }
+
    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setId(String newId) {
+        String oldId = id;
+        id = newId;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.MODEL_ELEMENT__ID, oldId, id));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @SuppressWarnings("unchecked")
@@ -621,15 +760,17 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
        case CorePackage.MODEL_ELEMENT__CONSTRAINT:
            return ((InternalEList<InternalEObject>) (InternalEList<?>) getConstraint()).basicAdd(otherEnd, msgs);
        case CorePackage.MODEL_ELEMENT__NAMESPACE:
-            if (eInternalContainer() != null)
+            if (eInternalContainer() != null) {
                msgs = eBasicRemoveFromContainer(msgs);
+            }
            return basicSetNamespace((Namespace) otherEnd, msgs);
        case CorePackage.MODEL_ELEMENT__IMPORTER:
            return ((InternalEList<InternalEObject>) (InternalEList<?>) getImporter()).basicAdd(otherEnd, msgs);
        case CorePackage.MODEL_ELEMENT__STEREOTYPE:
-            if (stereotype != null)
+            if (stereotype != null) {
                msgs = ((InternalEObject) stereotype).eInverseRemove(this, CorePackage.STEREOTYPE__EXTENDED_ELEMENT,
                        Stereotype.class, msgs);
+            }
            return basicSetStereotype((Stereotype) otherEnd, msgs);
        case CorePackage.MODEL_ELEMENT__TAGGED_VALUE:
            return ((InternalEList<InternalEObject>) (InternalEList<?>) getTaggedValue()).basicAdd(otherEnd, msgs);
@@ -659,6 +800,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -704,6 +846,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -717,6 +860,7 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -737,8 +881,9 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
        case CorePackage.MODEL_ELEMENT__IMPORTER:
            return getImporter();
        case CorePackage.MODEL_ELEMENT__STEREOTYPE:
-            if (resolve)
+            if (resolve) {
                return getStereotype();
+            }
            return basicGetStereotype();
        case CorePackage.MODEL_ELEMENT__TAGGED_VALUE:
            return getTaggedValue();
@@ -762,12 +907,15 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
            return getChangeRequest();
        case CorePackage.MODEL_ELEMENT__DASDL_PROPERTY:
            return getDasdlProperty();
+        case CorePackage.MODEL_ELEMENT__ID:
+            return getId();
        }
        return super.eGet(featureID, resolve, coreType);
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @SuppressWarnings("unchecked")
@@ -846,12 +994,16 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
            getDasdlProperty().clear();
            getDasdlProperty().addAll((Collection<? extends DASDLProperty>) newValue);
            return;
+        case CorePackage.MODEL_ELEMENT__ID:
+            setId((String) newValue);
+            return;
        }
        super.eSet(featureID, newValue);
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -914,12 +1066,16 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
        case CorePackage.MODEL_ELEMENT__DASDL_PROPERTY:
            getDasdlProperty().clear();
            return;
+        case CorePackage.MODEL_ELEMENT__ID:
+            setId(ID_EDEFAULT);
+            return;
        }
        super.eUnset(featureID);
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -963,24 +1119,30 @@ public abstract class ModelElementImpl extends ElementImpl implements ModelEleme
            return changeRequest != null && !changeRequest.isEmpty();
        case CorePackage.MODEL_ELEMENT__DASDL_PROPERTY:
            return dasdlProperty != null && !dasdlProperty.isEmpty();
+        case CorePackage.MODEL_ELEMENT__ID:
+            return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
        }
        return super.eIsSet(featureID);
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
    public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
            return super.toString();
+        }

        StringBuffer result = new StringBuffer(super.toString());
        result.append(" (name: ");
        result.append(name);
        result.append(", visibility: ");
        result.append(visibility);
+        result.append(", id: ");
+        result.append(id);
        result.append(')');
        return result.toString();
    }
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/util/CoreSwitch.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/cwm/objectmodel/core/util/CoreSwitch.java
@@ -9,6 +9,8 @@ import java.util.List;

 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 import orgomg.cwm.objectmodel.core.Attribute;
 import orgomg.cwm.objectmodel.core.BooleanExpression;
 import orgomg.cwm.objectmodel.core.Classifier;
@@ -40,7 +42,7 @@ import orgomg.cwm.objectmodel.core.TaggedValue;
 * @see orgomg.cwm.objectmodel.core.CorePackage
 * @generated
 */
-public class CoreSwitch<T> {
+public class CoreSwitch<T> extends Switch<T> {

    /**
     * The cached model package
@@ -62,30 +64,16 @@ public class CoreSwitch<T> {
    }

    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * Checks whether this is a switch for the given package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @parameter ePackage the package in question.
+     * @return whether this is a switch for the given package.
     * @generated
     */
-    public T doSwitch(EObject 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 --> <!--
-     * end-user-doc -->
-     * @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);
-        } else {
-            List<EClass> eSuperTypes = theEClass.getESuperTypes();
-            return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
-        }
+    @Override
+    protected boolean isSwitchFor(EPackage ePackage) {
+        return ePackage == modelPackage;
    }

    /**
@@ -95,6 +83,7 @@ public class CoreSwitch<T> {
     * @return the first non-null result returned by a <code>caseXXX</code> call.
     * @generated
     */
+    @Override
    protected T doSwitch(int classifierID, EObject theEObject) {
        switch (classifierID) {
        case CorePackage.ELEMENT: {
@@ -651,6 +640,7 @@ public class CoreSwitch<T> {
     * @see #doSwitch(org.eclipse.emf.ecore.EObject)
     * @generated
     */
+    @Override
    public T defaultCase(EObject object) {
        return null;
    }
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/mof/model/ModelElement.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/mof/model/ModelElement.java
@@ -11,15 +11,14 @@ import orgomg.cwmmip.ModeledGraphSubset;
 import orgomg.cwmmip.ModeledSemanticContext;

 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Element</b></em>'. <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
- *   <li>{@link orgomg.mof.model.ModelElement#getModeledGraphSubset <em>Modeled Graph Subset</em>}</li>
- *   <li>{@link orgomg.mof.model.ModelElement#getModeledProjection <em>Modeled Projection</em>}</li>
- *   <li>{@link orgomg.mof.model.ModelElement#getModeledSemanticContext <em>Modeled Semantic Context</em>}</li>
+ * <li>{@link orgomg.mof.model.ModelElement#getModeledGraphSubset <em>Modeled Graph Subset</em>}</li>
+ * <li>{@link orgomg.mof.model.ModelElement#getModeledProjection <em>Modeled Projection</em>}</li>
+ * <li>{@link orgomg.mof.model.ModelElement#getModeledSemanticContext <em>Modeled Semantic Context</em>}</li>
 * </ul>
 * </p>
 *
@@ -30,15 +29,15 @@ import orgomg.cwmmip.ModeledSemanticContext;
 public interface ModelElement extends EObject {

    /**
-     * Returns the value of the '<em><b>Modeled Graph Subset</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwmmip.ModeledGraphSubset}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwmmip.ModeledGraphSubset#getMofElement <em>Mof Element</em>}'.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Modeled Graph Subset</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwmmip.ModeledGraphSubset}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwmmip.ModeledGraphSubset#getMofElement <em>Mof Element</em>}'. <!-- begin-user-doc -->
     * <p>
-     * If the meaning of the '<em>Modeled Graph Subset</em>' reference list
-     * isn't clear, there really should be more of a description here...
+     * If the meaning of the '<em>Modeled Graph Subset</em>' reference list isn't clear, there really should be more of
+     * a description here...
     * </p>
     * <!-- end-user-doc -->
+     * 
     * @return the value of the '<em>Modeled Graph Subset</em>' reference list.
     * @see orgomg.mof.model.ModelPackage#getModelElement_ModeledGraphSubset()
     * @see orgomg.cwmmip.ModeledGraphSubset#getMofElement
@@ -48,15 +47,15 @@ public interface ModelElement extends EObject {
    EList<ModeledGraphSubset> getModeledGraphSubset();

    /**
-     * Returns the value of the '<em><b>Modeled Projection</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwmmip.ModeledSemanticContext}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwmmip.ModeledSemanticContext#getMofElement <em>Mof Element</em>}'.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Modeled Projection</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwmmip.ModeledSemanticContext}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwmmip.ModeledSemanticContext#getMofElement <em>Mof Element</em>}'. <!-- begin-user-doc -->
     * <p>
-     * If the meaning of the '<em>Modeled Projection</em>' reference list isn't
-     * clear, there really should be more of a description here...
+     * If the meaning of the '<em>Modeled Projection</em>' reference list isn't clear, there really should be more of a
+     * description here...
     * </p>
     * <!-- end-user-doc -->
+     * 
     * @return the value of the '<em>Modeled Projection</em>' reference list.
     * @see orgomg.mof.model.ModelPackage#getModelElement_ModeledProjection()
     * @see orgomg.cwmmip.ModeledSemanticContext#getMofElement
@@ -66,15 +65,16 @@ public interface ModelElement extends EObject {
    EList<ModeledSemanticContext> getModeledProjection();

    /**
-     * Returns the value of the '<em><b>Modeled Semantic Context</b></em>' reference list.
-     * The list contents are of type {@link orgomg.cwmmip.ModeledSemanticContext}.
-     * It is bidirectional and its opposite is '{@link orgomg.cwmmip.ModeledSemanticContext#getMofAnchorElement <em>Mof Anchor Element</em>}'.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Modeled Semantic Context</b></em>' reference list. The list contents are of type
+     * {@link orgomg.cwmmip.ModeledSemanticContext}. It is bidirectional and its opposite is '
+     * {@link orgomg.cwmmip.ModeledSemanticContext#getMofAnchorElement <em>Mof Anchor Element</em>}'. <!--
+     * begin-user-doc -->
     * <p>
-     * If the meaning of the '<em>Modeled Semantic Context</em>' reference list
-     * isn't clear, there really should be more of a description here...
+     * If the meaning of the '<em>Modeled Semantic Context</em>' reference list isn't clear, there really should be more
+     * of a description here...
     * </p>
     * <!-- end-user-doc -->
+     * 
     * @return the value of the '<em>Modeled Semantic Context</em>' reference list.
     * @see orgomg.mof.model.ModelPackage#getModelElement_ModeledSemanticContext()
     * @see orgomg.cwmmip.ModeledSemanticContext#getMofAnchorElement
--- a/main/plugins/org.talend.cwm.mip/src/orgomg/mof/model/impl/ModelElementImpl.java
+++ b/main/plugins/org.talend.cwm.mip/src/orgomg/mof/model/impl/ModelElementImpl.java
@@ -21,14 +21,13 @@ import orgomg.mof.model.ModelElement;
 import orgomg.mof.model.ModelPackage;

 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Element</b></em>'. <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * <ul>
- *   <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledGraphSubset <em>Modeled Graph Subset</em>}</li>
- *   <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledProjection <em>Modeled Projection</em>}</li>
- *   <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledSemanticContext <em>Modeled Semantic Context</em>}</li>
+ * <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledGraphSubset <em>Modeled Graph Subset</em>}</li>
+ * <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledProjection <em>Modeled Projection</em>}</li>
+ * <li>{@link orgomg.mof.model.impl.ModelElementImpl#getModeledSemanticContext <em>Modeled Semantic Context</em>}</li>
 * </ul>
 * </p>
 *
@@ -37,9 +36,9 @@ import orgomg.mof.model.ModelPackage;
 public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
-     * The cached value of the '{@link #getModeledGraphSubset() <em>Modeled Graph Subset</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getModeledGraphSubset() <em>Modeled Graph Subset</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getModeledGraphSubset()
     * @generated
     * @ordered
@@ -47,9 +46,9 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {
    protected EList<ModeledGraphSubset> modeledGraphSubset;

    /**
-     * The cached value of the '{@link #getModeledProjection() <em>Modeled Projection</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getModeledProjection() <em>Modeled Projection</em>}' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getModeledProjection()
     * @generated
     * @ordered
@@ -58,8 +57,8 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * The cached value of the '{@link #getModeledSemanticContext() <em>Modeled Semantic Context</em>}' reference list.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @see #getModeledSemanticContext()
     * @generated
     * @ordered
@@ -68,6 +67,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    protected ModelElementImpl() {
@@ -76,6 +76,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -85,8 +86,10 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ModeledGraphSubset> getModeledGraphSubset() {
        if (modeledGraphSubset == null) {
            modeledGraphSubset = new EObjectWithInverseResolvingEList<ModeledGraphSubset>(ModeledGraphSubset.class, this,
@@ -97,8 +100,10 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ModeledSemanticContext> getModeledProjection() {
        if (modeledProjection == null) {
            modeledProjection = new EObjectWithInverseResolvingEList.ManyInverse<ModeledSemanticContext>(
@@ -110,8 +115,10 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
+    @Override
    public EList<ModeledSemanticContext> getModeledSemanticContext() {
        if (modeledSemanticContext == null) {
            modeledSemanticContext = new EObjectWithInverseResolvingEList.ManyInverse<ModeledSemanticContext>(
@@ -123,6 +130,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @SuppressWarnings("unchecked")
@@ -141,6 +149,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -158,6 +167,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -175,6 +185,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @SuppressWarnings("unchecked")
@@ -199,6 +210,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
@@ -219,6 +231,7 @@ public class ModelElementImpl extends EObjectImpl implements ModelElement {

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
     * @generated
     */
    @Override
--- a/main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/ResourceHelper.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/ResourceHelper.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
+import orgomg.cwm.objectmodel.core.ModelElement;
+import orgomg.cwm.objectmodel.core.util.CoreSwitch;

 /**
 * @author scorreia
@@ -27,6 +29,14 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
 */
 public final class ResourceHelper {

+    public static final CoreSwitch<ModelElement> MODELEMENT = new CoreSwitch<ModelElement>() {
+
+        @Override
+        public ModelElement caseModelElement(ModelElement object) {
+            return object;
+        };
+    };
+
    private ResourceHelper() {
    }

@@ -43,6 +53,10 @@ public final class ResourceHelper {
        if (object.eIsProxy()) {
            return ((InternalEObject) object).eProxyURI().fragment();
        }
+        // MOD TDQ-10626 mzhao 2015-7-7
+        if (MODELEMENT.doSwitch(object) != null) {
+            return ((ModelElement) object).getId();
+        }
        Resource resource = object.eResource();
        if (resource == null || !(resource instanceof XMLResource)) {
            return null;