- Minor profile update, removed "Default" stereotype, since already standard UML default values are sufficient

13 files changed, 55 insertions, 790 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
index 0b83fd2e633..8bfc83622e0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
@@ -78,13 +78,13 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Array">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
+        unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" ordered="false"
         unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
+        unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_association" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Association"/>
+        unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Association"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Const">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
@@ -94,14 +94,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
         unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Default">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Ref">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
         unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index 2a30ebd43db..c6277d7e0ae 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
@@ -63,11 +63,6 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_property"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_operation"/>
     </genClasses>
-    <genClasses ecoreClass="C_Cpp.ecore#//Default">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Default/value"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Default/base_parameter"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Default/base_property"/>
-    </genClasses>
     <genClasses ecoreClass="C_Cpp.ecore#//Ref">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_parameter"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_property"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
index 98c4e27340f..aa07098dfe0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
@@ -994,6 +994,13 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_w3tfEsoSEeGKstsYRuxdvw" type="1034"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_w3tfE8oSEeGKstsYRuxdvw" type="1071">
+        <children xmi:type="notation:Shape" xmi:id="_4SCiACAzEeOBrb_t_69W4Q" type="3002" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__D4pQCAzEeOBrb_t_69W4Q" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__D4pQSAzEeOBrb_t_69W4Q" key="CustomAppearance_MaskValue" value="60"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="C_Cpp.profile.uml#_7e8P0ByPEduuTv8efIb91A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_4SCiASAzEeOBrb_t_69W4Q" x="55" y="16"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_w3tfFMoSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_w3tfFcoSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_w3tfFsoSEeGKstsYRuxdvw"/>
@@ -1006,7 +1013,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w3tfHMoSEeGKstsYRuxdvw"/>
       </children>
       <element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_5W6MUByPEduuTv8efIb91A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w3sQ8coSEeGKstsYRuxdvw" x="134" y="126" height="82"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w3sQ8coSEeGKstsYRuxdvw" x="90" y="126" width="163" height="82"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_w4F5kMoSEeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w4GgoMoSEeGKstsYRuxdvw" source="ShadowFigure">
@@ -1020,6 +1027,13 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_w4GgpsoSEeGKstsYRuxdvw" type="1034"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_w4Ggp8oSEeGKstsYRuxdvw" type="1071">
+        <children xmi:type="notation:Shape" xmi:id="_FdHcMCA0EeOBrb_t_69W4Q" type="3002" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Gque0CA0EeOBrb_t_69W4Q" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Gque0SA0EeOBrb_t_69W4Q" key="CustomAppearance_MaskValue" value="60"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="C_Cpp.profile.uml#_AOo5IByQEduuTv8efIb91A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_FdHcMSA0EeOBrb_t_69W4Q" x="57" y="10"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_w4GgqMoSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_w4GgqcoSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_w4GgqsoSEeGKstsYRuxdvw"/>
@@ -1046,6 +1060,13 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_w4gJRcoSEeGKstsYRuxdvw" type="1034"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_w4gJRsoSEeGKstsYRuxdvw" type="1071">
+        <children xmi:type="notation:Shape" xmi:id="_CUNKgCA0EeOBrb_t_69W4Q" type="3002" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_D_K3gCA0EeOBrb_t_69W4Q" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D_K3gSA0EeOBrb_t_69W4Q" key="CustomAppearance_MaskValue" value="60"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="C_Cpp.profile.uml#_EV0J4ByQEduuTv8efIb91A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_CUNKgSA0EeOBrb_t_69W4Q" x="61" y="11"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_w4gJR8oSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_w4gJSMoSEeGKstsYRuxdvw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_w4gJScoSEeGKstsYRuxdvw"/>
@@ -1100,7 +1121,7 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_y9ECAMoSEeGKstsYRuxdvw" type="1084"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y9Da8MoSEeGKstsYRuxdvw" x="135" y="36"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y9Da8MoSEeGKstsYRuxdvw" x="90" y="36" width="163"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_zlEdMMoSEeGKstsYRuxdvw" type="1031" fontName="Sans Serif" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zlFEQMoSEeGKstsYRuxdvw" source="ShadowFigure">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
index 334c1ce504e..4fa6b4c876c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
@@ -82,15 +82,21 @@
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_WgwmcByHEduN1bTiWJ0lyw" name="Array">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_Z3w-gByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Z4QGsByHEduN1bTiWJ0lyw">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ibI3cCBEEeOBrb_t_69W4Q"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ibQMMCBEEeOBrb_t_69W4Q" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_a8S9oByHEduN1bTiWJ0lyw" name="definition" isUnique="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_jd4uwByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_jeImYByIEduN1bTiWJ0lyw">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jdmaACBEEeOBrb_t_69W4Q"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jdsgoCBEEeOBrb_t_69W4Q" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_guP0gByPEduuTv8efIb91A" name="base_association" isUnique="false" association="_gufsIByPEduuTv8efIb91A">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kZzjkCBEEeOBrb_t_69W4Q"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kZ8tgCBEEeOBrb_t_69W4Q" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="_Z4QGsByHEduN1bTiWJ0lyw" name="E_Array_Parameter1" memberEnd="_Z3w-gByHEduN1bTiWJ0lyw _Z4QGsRyHEduN1bTiWJ0lyw">
@@ -116,20 +122,6 @@
     <packagedElement xmi:type="uml:Extension" xmi:id="_q3wUwByHEduN1bTiWJ0lyw" name="E_Const_Parameter1" memberEnd="_q3qOIByHEduN1bTiWJ0lyw _q3wUwRyHEduN1bTiWJ0lyw">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_q3wUwRyHEduN1bTiWJ0lyw" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_q3wUwByHEduN1bTiWJ0lyw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_ra3o4ByHEduN1bTiWJ0lyw" name="Default">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t6fF8ByHEduN1bTiWJ0lyw" name="value" isUnique="false">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_xl4ZoByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_xmL7oByHEduN1bTiWJ0lyw">
-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_k_BKUByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_k_LiYByIEduN1bTiWJ0lyw">
-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Extension" xmi:id="_xmL7oByHEduN1bTiWJ0lyw" name="Extension_CppDefault" memberEnd="_xl4ZoByHEduN1bTiWJ0lyw _xmL7oRyHEduN1bTiWJ0lyw">
-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_xmL7oRyHEduN1bTiWJ0lyw" name="Extension_CppDefault" type="_ra3o4ByHEduN1bTiWJ0lyw" association="_xmL7oByHEduN1bTiWJ0lyw"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_19ZzgByHEduN1bTiWJ0lyw" name="Ptr">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VbvCoByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Vb-6QByIEduN1bTiWJ0lyw">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
@@ -171,9 +163,6 @@
     <packagedElement xmi:type="uml:Extension" xmi:id="_kJ5gMByIEduN1bTiWJ0lyw" name="E_Const_Property1" memberEnd="_kJX7wByIEduN1bTiWJ0lyw _kJ5gMRyIEduN1bTiWJ0lyw">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kJ5gMRyIEduN1bTiWJ0lyw" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_kJ5gMByIEduN1bTiWJ0lyw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Extension" xmi:id="_k_LiYByIEduN1bTiWJ0lyw" name="Extension_CppDefault" memberEnd="_k_BKUByIEduN1bTiWJ0lyw _k_LiYRyIEduN1bTiWJ0lyw">
-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_k_LiYRyIEduN1bTiWJ0lyw" name="Extension_CppDefault" type="_ra3o4ByHEduN1bTiWJ0lyw" association="_k_LiYByIEduN1bTiWJ0lyw"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="_lzRRwByIEduN1bTiWJ0lyw" name="E_Ptr_Property1" memberEnd="_lylVQByIEduN1bTiWJ0lyw _lzRRwRyIEduN1bTiWJ0lyw">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_lzRRwRyIEduN1bTiWJ0lyw" name="extension_Ptr" type="_19ZzgByHEduN1bTiWJ0lyw" association="_lzRRwByIEduN1bTiWJ0lyw"/>
     </packagedElement>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
index 71ddfba49c0..d82c567d1d6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
@@ -39,7 +39,7 @@ public interface Array extends EObject {
 	 * @return the value of the '<em>Base parameter</em>' reference.
 	 * @see #setBase_parameter(Parameter)
 	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_parameter()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_parameter();
@@ -91,7 +91,7 @@ public interface Array extends EObject {
 	 * @return the value of the '<em>Base property</em>' reference.
 	 * @see #setBase_property(Property)
 	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_property()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	Property getBase_property();
@@ -117,7 +117,7 @@ public interface Array extends EObject {
 	 * @return the value of the '<em>Base association</em>' reference.
 	 * @see #setBase_association(Association)
 	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getArray_Base_association()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	Association getBase_association();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index d05347a1770..2fed909c509 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
@@ -67,15 +67,6 @@ public interface C_CppFactory extends EFactory {
 	Const createConst();
 
 	/**
-	 * Returns a new object of class '<em>Default</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Default</em>'.
-	 * @generated
-	 */
-	Default createDefault();
-
-	/**
 	 * Returns a new object of class '<em>Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
index b86055cbe22..761a1a74679 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
@@ -233,16 +233,6 @@ public interface C_CppPackage extends EPackage {
 	int CONST = 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.C_Cpp.impl.DefaultImpl
-	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getDefault()
-	 * @generated
-	 */
-	int DEFAULT = 8;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -250,7 +240,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
 	 * @generated
 	 */
-	int REF = 9;
+	int REF = 8;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
@@ -463,42 +453,6 @@ public interface C_CppPackage extends EPackage {
 	int CONST_FEATURE_COUNT = 3;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Base parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT__BASE_PARAMETER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Base property</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT__BASE_PROPERTY = 2;
-
-	/**
-	 * The number of structural features of the '<em>Default</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_FEATURE_COUNT = 3;
-
-	/**
 	 * The feature id for the '<em><b>Base parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -533,7 +487,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternal()
 	 * @generated
 	 */
-	int EXTERNAL = 10;
+	int EXTERNAL = 9;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -570,7 +524,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConstInit()
 	 * @generated
 	 */
-	int CONST_INIT = 11;
+	int CONST_INIT = 10;
 
 	/**
 	 * The feature id for the '<em><b>Initialisation</b></em>' attribute.
@@ -607,7 +561,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getFriend()
 	 * @generated
 	 */
-	int FRIEND = 12;
+	int FRIEND = 11;
 
 	/**
 	 * The feature id for the '<em><b>Base dependency</b></em>' reference.
@@ -644,7 +598,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getInline()
 	 * @generated
 	 */
-	int INLINE = 13;
+	int INLINE = 12;
 
 	/**
 	 * The feature id for the '<em><b>Base operation</b></em>' reference.
@@ -672,7 +626,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVirtual()
 	 * @generated
 	 */
-	int VIRTUAL = 14;
+	int VIRTUAL = 13;
 
 	/**
 	 * The feature id for the '<em><b>Base operation</b></em>' reference.
@@ -700,7 +654,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTypedef()
 	 * @generated
 	 */
-	int TYPEDEF = 15;
+	int TYPEDEF = 14;
 
 	/**
 	 * The feature id for the '<em><b>Definition</b></em>' attribute.
@@ -737,7 +691,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibility()
 	 * @generated
 	 */
-	int VISIBILITY = 16;
+	int VISIBILITY = 15;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -774,7 +728,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppInit()
 	 * @generated
 	 */
-	int CPP_INIT = 17;
+	int CPP_INIT = 16;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -811,7 +765,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplate()
 	 * @generated
 	 */
-	int TEMPLATE = 18;
+	int TEMPLATE = 17;
 
 	/**
 	 * The feature id for the '<em><b>Declaration</b></em>' attribute.
@@ -848,7 +802,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateBinding()
 	 * @generated
 	 */
-	int TEMPLATE_BINDING = 19;
+	int TEMPLATE_BINDING = 18;
 
 	/**
 	 * The feature id for the '<em><b>Binding</b></em>' attribute.
@@ -885,7 +839,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getTemplateParameter()
 	 * @generated
 	 */
-	int TEMPLATE_PARAMETER = 20;
+	int TEMPLATE_PARAMETER = 19;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -922,7 +876,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getUnion()
 	 * @generated
 	 */
-	int UNION = 21;
+	int UNION = 20;
 
 	/**
 	 * The feature id for the '<em><b>Base Data Type</b></em>' reference.
@@ -950,7 +904,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getStorageClass()
 	 * @generated
 	 */
-	int STORAGE_CLASS = 22;
+	int STORAGE_CLASS = 21;
 
 	/**
 	 * The feature id for the '<em><b>Storage Class</b></em>' attribute.
@@ -996,7 +950,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
 	 * @generated
 	 */
-	int VISIBILITY_KIND = 23;
+	int VISIBILITY_KIND = 22;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
@@ -1006,7 +960,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
 	 * @generated
 	 */
-	int EACCESS_KIND = 24;
+	int EACCESS_KIND = 23;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
@@ -1016,7 +970,7 @@ public interface C_CppPackage extends EPackage {
 	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
 	 * @generated
 	 */
-	int ESTORAGE_CLASS = 25;
+	int ESTORAGE_CLASS = 24;
 
 
 	/**
@@ -1268,49 +1222,6 @@ public interface C_CppPackage extends EPackage {
 	EReference getConst_Base_operation();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Default <em>Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Default</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.Default
-	 * @generated
-	 */
-	EClass getDefault();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.Default#getValue()
-	 * @see #getDefault()
-	 * @generated
-	 */
-	EAttribute getDefault_Value();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base parameter</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.Default#getBase_parameter()
-	 * @see #getDefault()
-	 * @generated
-	 */
-	EReference getDefault_Base_parameter();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base property</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.Default#getBase_property()
-	 * @see #getDefault()
-	 * @generated
-	 */
-	EReference getDefault_Base_property();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2101,40 +2012,6 @@ public interface C_CppPackage extends EPackage {
 		EReference CONST__BASE_OPERATION = eINSTANCE.getConst_Base_operation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl <em>Default</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.DefaultImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getDefault()
-		 * @generated
-		 */
-		EClass DEFAULT = eINSTANCE.getDefault();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEFAULT__VALUE = eINSTANCE.getDefault_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFAULT__BASE_PARAMETER = eINSTANCE.getDefault_Base_parameter();
-
-		/**
-		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFAULT__BASE_PROPERTY = eINSTANCE.getDefault_Base_property();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
index 270cab65a1a..11fbbcc6c7c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
@@ -62,7 +62,6 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 			case C_CppPackage.CPP_ROOT: return createCppRoot();
 			case C_CppPackage.ARRAY: return createArray();
 			case C_CppPackage.CONST: return createConst();
-			case C_CppPackage.DEFAULT: return createDefault();
 			case C_CppPackage.REF: return createRef();
 			case C_CppPackage.EXTERNAL: return createExternal();
 			case C_CppPackage.CONST_INIT: return createConstInit();
@@ -175,16 +174,6 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Default createDefault() {
-		DefaultImpl default_ = new DefaultImpl();
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public Ref createRef() {
 		RefImpl ref = new RefImpl();
 		return ref;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
index 8feb971efd7..37ae56dd417 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
@@ -86,13 +86,6 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass defaultEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EClass refEClass = null;
 
 	/**
@@ -504,42 +497,6 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getDefault() {
-		return defaultEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDefault_Value() {
-		return (EAttribute)defaultEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefault_Base_parameter() {
-		return (EReference)defaultEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefault_Base_property() {
-		return (EReference)defaultEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getRef() {
 		return refEClass;
 	}
@@ -1091,11 +1048,6 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 		createEReference(constEClass, CONST__BASE_PROPERTY);
 		createEReference(constEClass, CONST__BASE_OPERATION);
 
-		defaultEClass = createEClass(DEFAULT);
-		createEAttribute(defaultEClass, DEFAULT__VALUE);
-		createEReference(defaultEClass, DEFAULT__BASE_PARAMETER);
-		createEReference(defaultEClass, DEFAULT__BASE_PROPERTY);
-
 		refEClass = createEClass(REF);
 		createEReference(refEClass, REF__BASE_PARAMETER);
 		createEReference(refEClass, REF__BASE_PROPERTY);
@@ -1222,21 +1174,16 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 		initEReference(getCppRoot_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 1, 1, CppRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(arrayEClass, Array.class, "Array", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getArray_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getArray_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getArray_Definition(), theTypesPackage.getString(), "definition", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getArray_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getArray_Base_association(), theUMLPackage.getAssociation(), null, "base_association", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getArray_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getArray_Base_association(), theUMLPackage.getAssociation(), null, "base_association", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(constEClass, Const.class, "Const", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getConst_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getConst_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getConst_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(defaultEClass, Default.class, "Default", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDefault_Value(), theTypesPackage.getString(), "value", null, 1, 1, Default.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getDefault_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 1, 1, Default.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getDefault_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 1, 1, Default.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(refEClass, Ref.class, "Ref", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getRef_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRef_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/DefaultImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/DefaultImpl.java
deleted file mode 100644
index c0638b6db84..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/DefaultImpl.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.C_Cpp.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.C_Cpp.C_CppPackage;
-import org.eclipse.papyrus.C_Cpp.Default;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.impl.DefaultImpl#getBase_property <em>Base property</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefaultImpl extends EObjectImpl implements Default {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_parameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected Parameter base_parameter;
-
-	/**
-	 * The cached value of the '{@link #getBase_property() <em>Base property</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_property()
-	 * @generated
-	 * @ordered
-	 */
-	protected Property base_property;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return C_CppPackage.Literals.DEFAULT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.DEFAULT__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Parameter getBase_parameter() {
-		if (base_parameter != null && base_parameter.eIsProxy()) {
-			InternalEObject oldBase_parameter = (InternalEObject)base_parameter;
-			base_parameter = (Parameter)eResolveProxy(oldBase_parameter);
-			if (base_parameter != oldBase_parameter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.DEFAULT__BASE_PARAMETER, oldBase_parameter, base_parameter));
-			}
-		}
-		return base_parameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Parameter basicGetBase_parameter() {
-		return base_parameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_parameter(Parameter newBase_parameter) {
-		Parameter oldBase_parameter = base_parameter;
-		base_parameter = newBase_parameter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.DEFAULT__BASE_PARAMETER, oldBase_parameter, base_parameter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Property getBase_property() {
-		if (base_property != null && base_property.eIsProxy()) {
-			InternalEObject oldBase_property = (InternalEObject)base_property;
-			base_property = (Property)eResolveProxy(oldBase_property);
-			if (base_property != oldBase_property) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.DEFAULT__BASE_PROPERTY, oldBase_property, base_property));
-			}
-		}
-		return base_property;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Property basicGetBase_property() {
-		return base_property;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_property(Property newBase_property) {
-		Property oldBase_property = base_property;
-		base_property = newBase_property;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.DEFAULT__BASE_PROPERTY, oldBase_property, base_property));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case C_CppPackage.DEFAULT__VALUE:
-				return getValue();
-			case C_CppPackage.DEFAULT__BASE_PARAMETER:
-				if (resolve) return getBase_parameter();
-				return basicGetBase_parameter();
-			case C_CppPackage.DEFAULT__BASE_PROPERTY:
-				if (resolve) return getBase_property();
-				return basicGetBase_property();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case C_CppPackage.DEFAULT__VALUE:
-				setValue((String)newValue);
-				return;
-			case C_CppPackage.DEFAULT__BASE_PARAMETER:
-				setBase_parameter((Parameter)newValue);
-				return;
-			case C_CppPackage.DEFAULT__BASE_PROPERTY:
-				setBase_property((Property)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case C_CppPackage.DEFAULT__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case C_CppPackage.DEFAULT__BASE_PARAMETER:
-				setBase_parameter((Parameter)null);
-				return;
-			case C_CppPackage.DEFAULT__BASE_PROPERTY:
-				setBase_property((Property)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case C_CppPackage.DEFAULT__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case C_CppPackage.DEFAULT__BASE_PARAMETER:
-				return base_parameter != null;
-			case C_CppPackage.DEFAULT__BASE_PROPERTY:
-				return base_property != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DefaultImpl
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
index 94eceb92f24..bcb8c44e479 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
@@ -97,10 +97,6 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 				return createConstAdapter();
 			}
 			@Override
-			public Adapter caseDefault(Default object) {
-				return createDefaultAdapter();
-			}
-			@Override
 			public Adapter caseRef(Ref object) {
 				return createRefAdapter();
 			}
@@ -247,20 +243,6 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Default <em>Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.Default
-	 * @generated
-	 */
-	public Adapter createDefaultAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
index e4ff6079c77..55314a3e66e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
@@ -112,12 +112,6 @@ public class C_CppSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case C_CppPackage.DEFAULT: {
-				Default default_ = (Default)theEObject;
-				T result = caseDefault(default_);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case C_CppPackage.REF: {
 				Ref ref = (Ref)theEObject;
 				T result = caseRef(ref);
@@ -282,21 +276,6 @@ public class C_CppSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Default</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Default</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefault(Default object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StUtils.java
deleted file mode 100644
index da6cdf828a4..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StUtils.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.cpp.profile;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Some functions around stereotype usage.
- * 
- */
-public class StUtils {
-
-	/**
-	 * This method verifies if a stereotype is applied on an UML element
-	 * 
-	 * @param element
-	 *        A UML element
-	 * @param str_name
-	 *        a qualified stereotype name
-	 */
-	public static boolean isApplied(Element element, String str_name) {
-		return (element.getAppliedStereotype(str_name) != null);
-	}
-
-	/**
-	 * This method verifies if a stereotype is applied on an UML element
-	 * 
-	 * @param element
-	 *        A UML element
-	 * @param the
-	 *        class of an element of a static profile
-	 */
-	public static boolean isApplied(Element element, java.lang.Class<? extends EObject> clazz) {
-		for(EObject stereoApplication : element.getStereotypeApplications()) {
-			// check whether the stereotype is a subclass of the passed parameter clazz
-			if(clazz.isAssignableFrom(stereoApplication.getClass())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return the attribute of a stereotype. If the attribute type is a model reference,
-	 * use the function getAttributeBase instead.
-	 * 
-	 * @param element
-	 *        the element which holds the stereotype
-	 * @param stereo_name
-	 *        the name of the stereotype
-	 * @param attrib_name
-	 *        the name of an attribute of this stereotype
-	 * @return The value that is associated with the stereotype attribute
-	 */
-	public static Object getAttribute(Element element, String stereo_name, String attrib_name) {
-		Stereotype stereotype = element.getAppliedStereotype(stereo_name);
-		if(stereotype == null) {
-			return null;
-		}
-		return element.getValue(stereotype, attrib_name);
-	}
-
-	/**
-	 * Return the stereotype application. Like getStereotypeApplication, except
-	 * that the passed stereotype is a string.
-	 * 
-	 * @param element
-	 * @param stereo_name
-	 * @return
-	 */
-	public static EObject getApplication(Element element, String stereo_name) {
-
-		Stereotype stereotype = element.getApplicableStereotype(stereo_name);
-		if(stereotype != null) {
-			return element.getStereotypeApplication(stereotype);
-		}
-		return null;
-
-	}
-
-	/**
-	 * Apply a stereotype. The stereotype is not applied, if already a sub-stereotype is applied.
-	 * If you want to apply the new stereotype also in this case, use applyExact instead.
-	 * 
-	 * @param element
-	 *        the element
-	 * @param stereo_name
-	 *        the stereotype name
-	 * @return
-	 */
-	public static Stereotype apply(Element element, String stereo_name) {
-		Stereotype stereotype = element.getApplicableStereotype(stereo_name);
-		if(stereotype != null) {
-			EList<Stereotype> subStereos = element.getAppliedSubstereotypes(stereotype);
-			boolean alreadyApplied = (subStereos.size() > 0);
-			if(!alreadyApplied) {
-				// it seems that subSterotypes do not include the stereotype itself
-				if(element.getStereotypeApplication(stereotype) == null) {
-					element.applyStereotype(stereotype);
-				}
-			}
-		}
-		return stereotype;
-	}
-
-	/**
-	 * unapply a stereotype when the name of the stereotype is given.
-	 * 
-	 * @param element
-	 *        the element
-	 * @param stereo_name
-	 *        the stereotype name
-	 * @return
-	 */
-	public static void unapply(Element element, String stereo_name) {
-		Stereotype stereotype = element.getApplicableStereotype(stereo_name);
-		if(stereotype != null) {
-			if(element.getStereotypeApplication(stereotype) != null) {
-				element.unapplyStereotype(stereotype);
-			}
-		}
-	}
-
-	/**
-	 * Apply a stereotype and return the stereotype application (if successful).
-	 * The stereotype is not applied, if already a sub-stereotype is applied.
-	 * If you want to apply the new stereotype also in this case, use applyExact instead.
-	 * 
-	 * @param element
-	 *        the element
-	 * @param stereo_name
-	 *        the stereotype name
-	 * @return
-	 */
-	public static <T extends EObject> T applyApp(Element element, java.lang.Class<T> clazz) {
-		if(apply(element, clazz) != null) {
-			return UMLUtil.getStereotypeApplication(element, clazz);
-		}
-		return null;
-	}
-
-
-	/**
-	 * Apply a stereotype.
-	 * Caveat: the function relies on the correspondence between the fully qualified
-	 * stereotype name and the package name within the static profile. The latter may
-	 * use a different prefix (as it is the case with the MARTE analysis & design profile).
-	 * 
-	 * @param element
-	 *        the element
-	 * @param class a class of a static profile
-	 * @return
-	 */
-	public static Stereotype apply(Element element, java.lang.Class<? extends EObject> clazz) {
-		return apply(element, getStereoName(element, clazz));
-	}
-
-	/**
-	 * Unapply a stereotype.
-	 * Caveat: the function relies on the correspondence between the fully qualified
-	 * stereotype name and the package name within the static profile. The latter may
-	 * use a different prefix (as it is the case with the MARTE analysis & design profile).
-	 * 
-	 * @param element
-	 *        the element
-	 * @param stereo_name
-	 *        the stereotype name
-	 * @return
-	 */
-	public static void unapply(Element element, java.lang.Class<? extends EObject> clazz) {
-		unapply(element, getStereoName(element, clazz));
-	}
-
-
-	public static Stereotype getStereo(Element element, java.lang.Class<? extends EObject> clazz) {
-		return element.getAppliedStereotype(getStereoName(element, clazz));
-	}
-
-	/**
-	 * Get the stereotype-name that may relate to the name of an interface within a static profile.
-	 * Note that the class name within a static profile might have a prefix, such as org.eclipse.papyrus. This
-	 * functions tries to remove prefixes iteratively, if a stereotype is not applicable.
-	 *
-	 * @param clazz
-	 * @return
-	 */
-	public static String getStereoName(Element element, java.lang.Class<? extends EObject> clazz) {
-		String name = clazz.getName().replace(".", "::"); //$NON-NLS-1$ //$NON-NLS-2$;
-		while (element.getApplicableStereotype(name) == null) {
-			int index = name.indexOf("::"); //$NON-NLS-1$
-			if (index == -1) {
-				return null;
-			}
-			name = name.substring(index + 2);
-		}
-		return name;
-	}
-}