Bug 459465: [Model Import] Improve the "Remove unmapped profiles and

stereotypes" option
https://bugs.eclipse.org/bugs/show_bug.cgi?id=459465

Change-Id: I3b642d616ec2cd47c41bca69067be9ec7bb5035d
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>

13 files changed, 236 insertions, 154 deletions

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx
index 35de1c5568a..3e6e01269eb 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/dialog/RSAToPapyrusParameters.ctx
@@ -68,13 +68,13 @@
       <properties xmi:id="_zJ4D7HZLEeSwiJkQAQl2Jg" name="maxThreads" type="Integer" description="The maximum number of threads to use during the migration.&#xD;&#xA;More threads will provide faster results, at the cost of memory consumption."/>

       <properties xmi:id="_zJ4D7XZLEeSwiJkQAQl2Jg" name="removeUnmappedDiagrams" type="Boolean" description="If true, the diagrams which were not migrated will be removed. Otherwise, only the successfully imported diagrams will be removed"/>

       <properties xmi:id="_zJ4D7nZLEeSwiJkQAQl2Jg" name="convertOpaqueExpressionToLiteralString" type="Boolean" description="If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString"/>

-      <properties xmi:id="_zJ4D73ZLEeSwiJkQAQl2Jg" name="removeUnmappedProfilesAndStereotypes" type="Boolean" description="If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes"/>

+      <properties xmi:id="_zJ4D73ZLEeSwiJkQAQl2Jg" name="removeUnmappedProfilesAndStereotypes" type="Boolean" description="If true, all unsupported RSA profiles and stereotypes will be deleted at the end of the transformation"/>

       <properties xmi:id="_zJ4D8HZLEeSwiJkQAQl2Jg" name="removeUnmappedAnnotations" type="Boolean" description="If true, the unmapped RSA EAnnotations will be deleted from the imported model"/>

       <properties xmi:id="_jJtVUHcbEeSwiJkQAQl2Jg" name="alwaysAcceptSuggestedMappings" type="Boolean" description="If true, the Transformation will not open a dialog to ask user-confirmation for the dependency mappings. The tool will automatically keep going by &quot;guessing&quot; the proper mapping"/>

     </elements>

     <elements xmi:id="_zJ4D8XZLEeSwiJkQAQl2Jg" name="MappingParameters">

       <properties xmi:id="_zJ4D8nZLEeSwiJkQAQl2Jg" name="uriMappings" label="URI Mappings" type="Reference" multiplicity="-1" description="When models/libraries have been migrated separately, maps the libraries imported from RSA to their Papyrus equivalent"/>

-      <properties name="profileUriMappings" label="Profile URI Mappings" type="Reference" multiplicity="-1" description="When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent"/>

+      <properties xmi:id="_u4aUoNexEeSrN8eFf6IVtg" name="profileUriMappings" label="Profile URI Mappings" type="Reference" multiplicity="-1" description="When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent"/>

     </elements>

     <elements xmi:id="_zJ4D83ZLEeSwiJkQAQl2Jg" name="URIMapping">

       <properties xmi:id="_zJ4D9HZLEeSwiJkQAQl2Jg" name="sourceURI"/>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore
index c05e775b17c..b11879cf2f5 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore
@@ -28,9 +28,9 @@
     </eStructuralFeatures>

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

         ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType ../../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"

-        defaultValueLiteral="true">

+        defaultValueLiteral="false">

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

-        <details key="documentation" value="If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes"/>

+        <details key="documentation" value="If true, all unsupported RSA profiles and stereotypes will be deleted at the end of the transformation"/>

       </eAnnotations>

     </eStructuralFeatures>

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

@@ -56,7 +56,11 @@
       </eAnnotations>

     </eStructuralFeatures>

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

-        upperBound="-1" eType="#//URIMapping" containment="true"/>

+        upperBound="-1" eType="#//URIMapping" containment="true">

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

+        <details key="documentation" value="When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent"/>

+      </eAnnotations>

+    </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="URIMapping">

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

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml
index bf6fb49370a..c97837bf2de 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/ui/rsaToPapyrusParameters.uml
@@ -1,112 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g">

-  <uml:Model xmi:id="_fduSAEL1EeSSlqpbHKLCqA" name="RSAToPapyrusParameters">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_fduSAUL1EeSSlqpbHKLCqA">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_tKu0kEL1EeSSlqpbHKLCqA" name="Config">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_slkewHZKEeSwiJkQAQl2Jg" name="mappingParameters" type="_erBPcHZKEeSwiJkQAQl2Jg" aggregation="composite" association="_slkew3ZKEeSwiJkQAQl2Jg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_slkewXZKEeSwiJkQAQl2Jg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_slkewnZKEeSwiJkQAQl2Jg" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AYwUoFOJEeSGbsrkEkSKIA" name="maxThreads" visibility="public" isUnique="false">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_W1iDAGW5EeS5_vjAduszYQ" annotatedElement="_AYwUoFOJEeSGbsrkEkSKIA">

-          <body>The maximum number of threads to use during the migration.&#xD;

+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_fduSAEL1EeSSlqpbHKLCqA" name="RSAToPapyrusParameters">

+  <packageImport xmi:type="uml:PackageImport" xmi:id="_fduSAUL1EeSSlqpbHKLCqA">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Class" xmi:id="_tKu0kEL1EeSSlqpbHKLCqA" name="Config">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_slkewHZKEeSwiJkQAQl2Jg" name="mappingParameters" type="_erBPcHZKEeSwiJkQAQl2Jg" aggregation="composite" association="_slkew3ZKEeSwiJkQAQl2Jg">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_slkewXZKEeSwiJkQAQl2Jg" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_slkewnZKEeSwiJkQAQl2Jg" value="1"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_AYwUoFOJEeSGbsrkEkSKIA" name="maxThreads" visibility="public" isUnique="false">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_W1iDAGW5EeS5_vjAduszYQ" annotatedElement="_AYwUoFOJEeSGbsrkEkSKIA">

+        <body>The maximum number of threads to use during the migration.&#xD;

 More threads will provide faster results, at the cost of memory consumption.</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DhmU4FOJEeSGbsrkEkSKIA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhwF4FOJEeSGbsrkEkSKIA" value="1"/>

-        <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_E7A-4FOJEeSGbsrkEkSKIA" value="2"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Wt4XkEL2EeSSlqpbHKLCqA" name="removeUnmappedDiagrams" visibility="public" isUnique="false">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_YchfIEMAEeSX267OQHSClQ" annotatedElement="_Wt4XkEL2EeSSlqpbHKLCqA">

-          <body>If true, the diagrams which were not migrated will be removed. Otherwise, only the successfully imported diagrams will be removed</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yj3BwEL2EeSSlqpbHKLCqA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yj3BwUL2EeSSlqpbHKLCqA" value="1"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_Zf9doEL2EeSSlqpbHKLCqA"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t42e0EL1EeSSlqpbHKLCqA" name="convertOpaqueExpressionToLiteralString" visibility="public" isUnique="false">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_sSSQAEL9EeSX267OQHSClQ" annotatedElement="_t42e0EL1EeSSlqpbHKLCqA">

-          <body>If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0H-TgEL1EeSSlqpbHKLCqA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0IHdcEL1EeSSlqpbHKLCqA" value="1"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_3f1nMEL1EeSSlqpbHKLCqA" value="true"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_65pboEL1EeSSlqpbHKLCqA" name="removeUnmappedProfilesAndStereotypes" visibility="public" isUnique="false">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_zDs5cEL9EeSX267OQHSClQ" annotatedElement="_65pboEL1EeSSlqpbHKLCqA">

-          <body>If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gy7WwEL2EeSSlqpbHKLCqA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gy7WwUL2EeSSlqpbHKLCqA" value="1"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_H7rHgEL2EeSSlqpbHKLCqA" value="true"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Mv8HwEL2EeSSlqpbHKLCqA" name="removeUnmappedAnnotations" visibility="public" isUnique="false">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_rogy4EMAEeSX267OQHSClQ" annotatedElement="_Mv8HwEL2EeSSlqpbHKLCqA">

-          <body>If true, the unmapped RSA EAnnotations will be deleted from the imported model</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S39O4EL2EeSSlqpbHKLCqA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S39O4UL2EeSSlqpbHKLCqA" value="1"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_UQehAEL2EeSSlqpbHKLCqA"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_JWjgUHcbEeSwiJkQAQl2Jg" name="alwaysAcceptSuggestedMappings" visibility="public">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_aOft0HcbEeSwiJkQAQl2Jg" annotatedElement="_JWjgUHcbEeSwiJkQAQl2Jg">

-          <body>If true, the Transformation will not open a dialog to ask user-confirmation for the dependency mappings. The tool will automatically keep going by &quot;guessing&quot; the proper mapping</body>

-        </ownedComment>

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P_5L0HcbEeSwiJkQAQl2Jg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P_5L0XcbEeSwiJkQAQl2Jg" value="1"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_P_5L0ncbEeSwiJkQAQl2Jg"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_MDmyMFOJEeSGbsrkEkSKIA" name="URIMapping">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_MiP2AFOJEeSGbsrkEkSKIA" name="sourceURI" visibility="public" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OrbJAFOJEeSGbsrkEkSKIA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OrbJAVOJEeSGbsrkEkSKIA" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_O-dZwFOJEeSGbsrkEkSKIA" name="targetURI" visibility="public" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RAos4FOJEeSGbsrkEkSKIA" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RAos4VOJEeSGbsrkEkSKIA" value="1"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_erBPcHZKEeSwiJkQAQl2Jg" name="MappingParameters">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LgpPEFOJEeSGbsrkEkSKIA" name="uriMappings" visibility="public" type="_MDmyMFOJEeSGbsrkEkSKIA" aggregation="composite">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iBwD0GW5EeS5_vjAduszYQ" annotatedElement="_LgpPEFOJEeSGbsrkEkSKIA">

-          <body>When models/libraries have been migrated separately, maps the libraries imported from RSA to their Papyrus equivalent</body>

-        </ownedComment>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T5kB0FOJEeSGbsrkEkSKIA"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T5kB0VOJEeSGbsrkEkSKIA" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pR2YYIQ5EeSC0ajaKNekyw" name="profileUriMappings" visibility="public" type="_MDmyMFOJEeSGbsrkEkSKIA" aggregation="composite">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_49zT4IQ5EeSC0ajaKNekyw" annotatedElement="_pR2YYIQ5EeSC0ajaKNekyw">

-          <body>When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent</body>

-        </ownedComment>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qweSgIQ5EeSC0ajaKNekyw"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qwfgoIQ5EeSC0ajaKNekyw" value="*"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_slkew3ZKEeSwiJkQAQl2Jg" memberEnd="_slkexHZKEeSwiJkQAQl2Jg _slkewHZKEeSwiJkQAQl2Jg">

-      <ownedEnd xmi:type="uml:Property" xmi:id="_slkexHZKEeSwiJkQAQl2Jg" name="config" type="_tKu0kEL1EeSSlqpbHKLCqA" association="_slkew3ZKEeSwiJkQAQl2Jg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_slkexXZKEeSwiJkQAQl2Jg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_slkexnZKEeSwiJkQAQl2Jg" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_zg2CEEL1EeSSlqpbHKLCqA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zhSuAEL1EeSSlqpbHKLCqA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

-    </profileApplication>

-  </uml:Model>

-  <ActionLanguage:TextualRepresentation xmi:id="_zhuy4EL1EeSSlqpbHKLCqA" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_8D4aIUL1EeSSlqpbHKLCqA" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

-  <ActionLanguage:TextualRepresentation xmi:id="_Pp6KgFOJEeSGbsrkEkSKIA" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

-</xmi:XMI>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DhmU4FOJEeSGbsrkEkSKIA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhwF4FOJEeSGbsrkEkSKIA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_E7A-4FOJEeSGbsrkEkSKIA" value="2"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Wt4XkEL2EeSSlqpbHKLCqA" name="removeUnmappedDiagrams" visibility="public" isUnique="false">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_YchfIEMAEeSX267OQHSClQ" annotatedElement="_Wt4XkEL2EeSSlqpbHKLCqA">

+        <body>If true, the diagrams which were not migrated will be removed. Otherwise, only the successfully imported diagrams will be removed</body>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yj3BwEL2EeSSlqpbHKLCqA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yj3BwUL2EeSSlqpbHKLCqA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_Zf9doEL2EeSSlqpbHKLCqA"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_t42e0EL1EeSSlqpbHKLCqA" name="convertOpaqueExpressionToLiteralString" visibility="public" isUnique="false">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_sSSQAEL9EeSX267OQHSClQ" annotatedElement="_t42e0EL1EeSSlqpbHKLCqA">

+        <body>If true, the Opaque Expressions with a single body and no language (or a single empty language) will be converted to LiteralString</body>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0H-TgEL1EeSSlqpbHKLCqA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0IHdcEL1EeSSlqpbHKLCqA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_3f1nMEL1EeSSlqpbHKLCqA" value="true"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_65pboEL1EeSSlqpbHKLCqA" name="removeUnmappedProfilesAndStereotypes" visibility="public" isUnique="false">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_zDs5cEL9EeSX267OQHSClQ" annotatedElement="_65pboEL1EeSSlqpbHKLCqA">

+        <body>If true, all unsupported RSA profiles and stereotypes will be deleted at the end of the transformation</body>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gy7WwEL2EeSSlqpbHKLCqA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gy7WwUL2EeSSlqpbHKLCqA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_H7rHgEL2EeSSlqpbHKLCqA"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Mv8HwEL2EeSSlqpbHKLCqA" name="removeUnmappedAnnotations" visibility="public" isUnique="false">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_rogy4EMAEeSX267OQHSClQ" annotatedElement="_Mv8HwEL2EeSSlqpbHKLCqA">

+        <body>If true, the unmapped RSA EAnnotations will be deleted from the imported model</body>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S39O4EL2EeSSlqpbHKLCqA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S39O4UL2EeSSlqpbHKLCqA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_UQehAEL2EeSSlqpbHKLCqA"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JWjgUHcbEeSwiJkQAQl2Jg" name="alwaysAcceptSuggestedMappings" visibility="public">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_aOft0HcbEeSwiJkQAQl2Jg" annotatedElement="_JWjgUHcbEeSwiJkQAQl2Jg">

+        <body>If true, the Transformation will not open a dialog to ask user-confirmation for the dependency mappings. The tool will automatically keep going by &quot;guessing&quot; the proper mapping</body>

+      </ownedComment>

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P_5L0HcbEeSwiJkQAQl2Jg" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P_5L0XcbEeSwiJkQAQl2Jg" value="1"/>

+      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_P_5L0ncbEeSwiJkQAQl2Jg"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:DataType" xmi:id="_MDmyMFOJEeSGbsrkEkSKIA" name="URIMapping">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MiP2AFOJEeSGbsrkEkSKIA" name="sourceURI" visibility="public" isUnique="false">

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OrbJAFOJEeSGbsrkEkSKIA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OrbJAVOJEeSGbsrkEkSKIA" value="1"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_O-dZwFOJEeSGbsrkEkSKIA" name="targetURI" visibility="public" isUnique="false">

+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RAos4FOJEeSGbsrkEkSKIA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RAos4VOJEeSGbsrkEkSKIA" value="1"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_erBPcHZKEeSwiJkQAQl2Jg" name="MappingParameters">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_LgpPEFOJEeSGbsrkEkSKIA" name="uriMappings" visibility="public" type="_MDmyMFOJEeSGbsrkEkSKIA" aggregation="composite">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_iBwD0GW5EeS5_vjAduszYQ" annotatedElement="_LgpPEFOJEeSGbsrkEkSKIA">

+        <body>When models/libraries have been migrated separately, maps the libraries imported from RSA to their Papyrus equivalent</body>

+      </ownedComment>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T5kB0FOJEeSGbsrkEkSKIA"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T5kB0VOJEeSGbsrkEkSKIA" value="*"/>

+    </ownedAttribute>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_pR2YYIQ5EeSC0ajaKNekyw" name="profileUriMappings" visibility="public" type="_MDmyMFOJEeSGbsrkEkSKIA" aggregation="composite">

+      <ownedComment xmi:type="uml:Comment" xmi:id="_49zT4IQ5EeSC0ajaKNekyw" annotatedElement="_pR2YYIQ5EeSC0ajaKNekyw">

+        <body>When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent</body>

+      </ownedComment>

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qweSgIQ5EeSC0ajaKNekyw"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qwfgoIQ5EeSC0ajaKNekyw" value="*"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Association" xmi:id="_slkew3ZKEeSwiJkQAQl2Jg" memberEnd="_slkexHZKEeSwiJkQAQl2Jg _slkewHZKEeSwiJkQAQl2Jg">

+    <ownedEnd xmi:type="uml:Property" xmi:id="_slkexHZKEeSwiJkQAQl2Jg" name="config" type="_tKu0kEL1EeSSlqpbHKLCqA" association="_slkew3ZKEeSwiJkQAQl2Jg">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_slkexXZKEeSwiJkQAQl2Jg" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_slkexnZKEeSwiJkQAQl2Jg" value="1"/>

+    </ownedEnd>

+  </packagedElement>

+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_zg2CEEL1EeSSlqpbHKLCqA">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zhSuAEL1EeSSlqpbHKLCqA" source="http://www.eclipse.org/uml2/2.0.0/UML">

+      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g"/>

+    </eAnnotations>

+    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

+  </profileApplication>

+</uml:Model>

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java
index 70698f2fa99..1ad2a3d1d21 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/Config.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#getMappingParameters <em>Mapping Parameters</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#getMaxThreads <em>Max Threads</em>}</li>

@@ -29,7 +30,6 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config#isAlwaysAcceptSuggestedMappings <em>Always Accept Suggested Mappings</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig()

  * @model

@@ -154,17 +154,17 @@ public interface Config extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Remove Unmapped Profiles And Stereotypes</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

+	 * The default value is <code>"false"</code>.

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

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

 	 * <!-- begin-model-doc -->

-	 * If true, the unsupported RSA profiles and stereotypes will be deleted. This includes the Deployment profile and a few stereotypes

+	 * If true, all unsupported RSA profiles and stereotypes will be deleted at the end of the transformation

 	 * <!-- end-model-doc -->

 	 *

 	 * @return the value of the '<em>Remove Unmapped Profiles And Stereotypes</em>' attribute.

 	 * @see #setRemoveUnmappedProfilesAndStereotypes(boolean)

 	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getConfig_RemoveUnmappedProfilesAndStereotypes()

-	 * @model default="true" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

+	 * @model default="false" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"

 	 * @generated

 	 */

 	boolean isRemoveUnmappedProfilesAndStereotypes();

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/MappingParameters.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/MappingParameters.java
index 8e201bd83f4..c271cc4f20e 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/MappingParameters.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/MappingParameters.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.MappingParameters#getUriMappings <em>Uri Mappings</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.MappingParameters#getProfileUriMappings <em>Profile Uri Mappings</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getMappingParameters()

  * @model

@@ -57,6 +57,9 @@ public interface MappingParameters extends EObject {
 	 * If the meaning of the '<em>Profile Uri Mappings</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

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

+	 * <!-- begin-model-doc -->

+	 * When profiles have been migrated separately, maps the profiles imported from RSA to their Papyrus equivalent

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

 	 *

 	 * @return the value of the '<em>Profile Uri Mappings</em>' containment reference list.

 	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getMappingParameters_ProfileUriMappings()

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/URIMapping.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/URIMapping.java
index 70ac4300a20..0975f4fc674 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/URIMapping.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/URIMapping.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.URIMapping#getSourceURI <em>Source URI</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.URIMapping#getTargetURI <em>Target URI</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#getURIMapping()

  * @model

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java
index fc1389e98eb..111e0afe3ad 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/ConfigImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusPara
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#getMappingParameters <em>Mapping Parameters</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#getMaxThreads <em>Max Threads</em>}</li>

@@ -36,7 +37,6 @@ import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusPara
  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isRemoveUnmappedAnnotations <em>Remove Unmapped Annotations</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.ConfigImpl#isAlwaysAcceptSuggestedMappings <em>Always Accept Suggested Mappings</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -127,7 +127,7 @@ public class ConfigImpl extends MinimalEObjectImpl.Container implements Config {
 	 * @generated

 	 * @ordered

 	 */

-	protected static final boolean REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT = true;

+	protected static final boolean REMOVE_UNMAPPED_PROFILES_AND_STEREOTYPES_EDEFAULT = false;

 

 	/**

 	 * The cached value of the '{@link #isRemoveUnmappedProfilesAndStereotypes() <em>Remove Unmapped Profiles And Stereotypes</em>}' attribute.

@@ -256,8 +256,7 @@ public class ConfigImpl extends MinimalEObjectImpl.Container implements Config {
 			if (msgs != null) {

 				msgs.dispatch();

 			}

-		}

-		else if (eNotificationRequired()) {

+		} else if (eNotificationRequired()) {

 			eNotify(new ENotificationImpl(this, Notification.SET, RSAToPapyrusParametersPackage.CONFIG__MAPPING_PARAMETERS, newMappingParameters, newMappingParameters));

 		}

 	}

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/MappingParametersImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/MappingParametersImpl.java
index 528a72c4d76..04669481448 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/MappingParametersImpl.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/MappingParametersImpl.java
@@ -35,11 +35,11 @@ import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.URIMapping;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.MappingParametersImpl#getUriMappings <em>Uri Mappings</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.MappingParametersImpl#getProfileUriMappings <em>Profile Uri Mappings</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java
index 714e683dc6a..1c3b0a44376 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/RSAToPapyrusParametersPackageImpl.java
@@ -56,10 +56,15 @@ public class RSAToPapyrusParametersPackageImpl extends EPackageImpl implements R
 	private EClass uriMappingEClass = null;

 

 	/**

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

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

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

 	 * package URI value.

 	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * Note: the correct way to create the package is via the static

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

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

+	 * if one already exists.

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

 	 *

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

 	 * @see org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.RSAToPapyrusParametersPackage#eNS_URI

@@ -82,7 +87,9 @@ public class RSAToPapyrusParametersPackageImpl extends EPackageImpl implements R
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

 	 *

 	 * <p>

-	 * This method is used to initialize {@link RSAToPapyrusParametersPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

+	 * This method is used to initialize {@link RSAToPapyrusParametersPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

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

 	 * end-user-doc -->

 	 *

 	 * @see #eNS_URI

@@ -369,7 +376,7 @@ public class RSAToPapyrusParametersPackageImpl extends EPackageImpl implements R
 		initEAttribute(getConfig_RemoveUnmappedDiagrams(), theTypesPackage.getBoolean(), "removeUnmappedDiagrams", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEAttribute(getConfig_ConvertOpaqueExpressionToLiteralString(), theTypesPackage.getBoolean(), "convertOpaqueExpressionToLiteralString", "true", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

 				!IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getConfig_RemoveUnmappedProfilesAndStereotypes(), theTypesPackage.getBoolean(), "removeUnmappedProfilesAndStereotypes", "true", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

+		initEAttribute(getConfig_RemoveUnmappedProfilesAndStereotypes(), theTypesPackage.getBoolean(), "removeUnmappedProfilesAndStereotypes", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

 				!IS_DERIVED, !IS_ORDERED);

 		initEAttribute(getConfig_RemoveUnmappedAnnotations(), theTypesPackage.getBoolean(), "removeUnmappedAnnotations", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEAttribute(getConfig_AlwaysAcceptSuggestedMappings(), theTypesPackage.getBoolean(), "alwaysAcceptSuggestedMappings", "false", 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/URIMappingImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/URIMappingImpl.java
index 0c914ff382c..28ee0143de0 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/URIMappingImpl.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/impl/URIMappingImpl.java
@@ -24,11 +24,11 @@ import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.URIMapping;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.URIMappingImpl#getSourceURI <em>Source URI</em>}</li>

  * <li>{@link org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.impl.URIMappingImpl#getTargetURI <em>Target URI</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java
index 34440423fa8..2f9e6f9cb3d 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersAdapterFactory.java
@@ -79,28 +79,27 @@ public class RSAToPapyrusParametersAdapterFactory extends AdapterFactoryImpl {
 	 *

 	 * @generated

 	 */

-	protected RSAToPapyrusParametersSwitch<Adapter> modelSwitch =

-			new RSAToPapyrusParametersSwitch<Adapter>() {

-				@Override

-				public Adapter caseConfig(Config object) {

-					return createConfigAdapter();

-				}

+	protected RSAToPapyrusParametersSwitch<Adapter> modelSwitch = new RSAToPapyrusParametersSwitch<Adapter>() {

+		@Override

+		public Adapter caseConfig(Config object) {

+			return createConfigAdapter();

+		}

 

-				@Override

-				public Adapter caseMappingParameters(MappingParameters object) {

-					return createMappingParametersAdapter();

-				}

+		@Override

+		public Adapter caseMappingParameters(MappingParameters object) {

+			return createMappingParametersAdapter();

+		}

 

-				@Override

-				public Adapter caseURIMapping(URIMapping object) {

-					return createURIMappingAdapter();

-				}

+		@Override

+		public Adapter caseURIMapping(URIMapping object) {

+			return createURIMappingAdapter();

+		}

 

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

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

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java
index 2685c540077..e5bb75d46fd 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/RSAToPapyrusParameters/util/RSAToPapyrusParametersSwitch.java
@@ -60,7 +60,8 @@ public class RSAToPapyrusParametersSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc -->

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

 	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage

+	 *            the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformationLauncher.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformationLauncher.java
index d43b78291ca..7a7fdfe0daa 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformationLauncher.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ImportTransformationLauncher.java
@@ -30,9 +30,12 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;

 import org.eclipse.core.runtime.jobs.Job;

 import org.eclipse.core.runtime.jobs.JobChangeAdapter;

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

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.transaction.RollbackException;

 import org.eclipse.emf.transaction.Transaction;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

@@ -44,6 +47,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;

 import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.tools.util.StringHelper;

 import org.eclipse.papyrus.migration.rsa.Activator;

 import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.Config;

 import org.eclipse.papyrus.migration.rsa.RSAToPapyrusParameters.MappingParameters;

@@ -65,6 +69,8 @@ import org.eclipse.ui.console.MessageConsole;
 import org.eclipse.ui.console.MessageConsoleStream;

 import org.eclipse.ui.dialogs.SelectionDialog;

 import org.eclipse.ui.statushandlers.StatusManager;

+import org.eclipse.uml2.uml.Profile;

+import org.eclipse.uml2.uml.ProfileApplication;

 

 /**

  * Executes a batch of {@link ImportTransformation}s, then restores the dependencies (References)

@@ -526,6 +532,65 @@ public class ImportTransformationLauncher {
 			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occurred when repairing profiles/stereotypes", ex);

 		}

 

+		if (config.isRemoveUnmappedProfilesAndStereotypes()) {

+			try {

+				for (final Resource resource : resourcesToRepair) {

+					final List<EObject> eObjectsToDelete = new LinkedList<EObject>();

+					TreeIterator<EObject> allContents = resource.getAllContents();

+					while (allContents.hasNext()) {

+						EObject next = allContents.next();

+						if (next.eResource() != resource) {

+							allContents.prune();

+							continue;

+						}

+

+						// Delete instances of RSA Stereotypes

+						URI eClassURI = EcoreUtil.getURI(next.eClass());

+						if (StringHelper.equals("epx", eClassURI.fileExtension())) {

+							eObjectsToDelete.add(next);

+							allContents.prune();

+							continue;

+						}

+

+						// Delete applications of RSA Profiles

+						if (next instanceof ProfileApplication) {

+							ProfileApplication profileApplication = (ProfileApplication) next;

+							Profile appliedProfile = profileApplication.getAppliedProfile();

+							if (appliedProfile != null) {

+								URI profileURI = EcoreUtil.getURI(appliedProfile);

+								if (StringHelper.equals("epx", profileURI.fileExtension())) {

+									eObjectsToDelete.add(next);

+									allContents.prune();

+									continue;

+								}

+							}

+						}

+					}

+

+					Runnable runnable = new Runnable() {

+						@Override

+						public void run() {

+							for (EObject eObject : eObjectsToDelete) {

+								EObject parentElement = eObject.eContainer();

+								if (parentElement == null) {

+									resource.getContents().remove(eObject);

+								} else {

+									EStructuralFeature containingFeature = eObject.eContainingFeature();

+									EcoreUtil.remove(parentElement, containingFeature, eObject);

+								}

+							}

+						}

+					};

+

+					runFastTransaction(modelSet.getTransactionalEditingDomain(), runnable);

+

+				}

+			} catch (Exception ex) {

+				Activator.log.error(ex);

+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occurred when repairing profiles/stereotypes", ex);

+			}

+		}

+

 		try {

 

 			for (Resource resource : resourcesToRepair) {

@@ -614,10 +679,19 @@ public class ImportTransformationLauncher {
 		return false;

 	}

 

-	protected void repairProxies(final ModelSet modelSet, final Collection<Resource> resourcesToRepair, Map<URI, URI> urisToReplace, IProgressMonitor monitor) throws InterruptedException, RollbackException {

-

+	protected void repairProxies(final ModelSet modelSet, final Collection<Resource> resourcesToRepair, final Map<URI, URI> urisToReplace, IProgressMonitor monitor) throws InterruptedException, RollbackException {

 		final TransactionalEditingDomain domain = modelSet.getTransactionalEditingDomain();

+		Runnable runnable = new Runnable() {

+			@Override

+			public void run() {

+				DependencyManagementHelper.batchUpdateDependencies(urisToReplace, resourcesToRepair, domain);

+			}

+		};

+

+		runFastTransaction(domain, runnable);

+	}

 

+	protected static final void runFastTransaction(TransactionalEditingDomain domain, Runnable runnable) throws InterruptedException, RollbackException {

 		InternalTransactionalEditingDomain internalDomain = (InternalTransactionalEditingDomain) domain;

 

 		Map<String, Object> options = new HashMap<String, Object>();

@@ -628,7 +702,7 @@ public class ImportTransformationLauncher {
 		// We're in a batch environment, with no undo/redo support. Run a vanilla transaction to improve performances

 		Transaction fastTransaction = internalDomain.startTransaction(false, options);

 		try {

-			DependencyManagementHelper.batchUpdateDependencies(urisToReplace, resourcesToRepair, domain);

+			runnable.run();

 		} finally {

 			fastTransaction.commit();

 		}