Bug 489116 - Unify diagram visualID of all diagrams in Papyrus

1. Changed the visual ids of the UML2 diagrams from numbers to
meaningful names corresponding to notational cases. This was applied
consistely across diagram such that similar cases get similar visual
ids. Added diagram reconcilers for v1.2 to migrate older diagrams.

2. Amalgamated the UML2 diagram element types into a single model
(umldi.elementtypesconfigurations). Some diagrams, like Sequence,
Communication and Timing, still use extension-based configurations and
will need to be migrated later.


Change-Id: I7f47b25454dcd1ed81e8f3eeffc1a09a2584d316
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

38 files changed, 2606 insertions, 2602 deletions

diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants
index 6773b06aee8..2cae91ac591 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants
@@ -264,10 +264,10 @@
   <elementTypeID>org.eclipse.papyrus.example.j2ee.Browser</elementTypeID>
   <elementTypeID>org.eclipse.papyrus.example.j2ee.BranchPoint</elementTypeID>
   <elementTypeID>org.eclipse.papyrus.example.j2ee.WebScenario</elementTypeID>
-  <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Association_4019</excludedElementTypeID>
-  <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Association_2015</excludedElementTypeID>
-  <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018</excludedElementTypeID>
-  <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014</excludedElementTypeID>
+  <excludedElementTypeID>org.eclipse.papyrus.umldi.Association_BranchEdge</excludedElementTypeID>
+  <excludedElementTypeID>org.eclipse.papyrus.umldi.Association_Shape</excludedElementTypeID>
+  <excludedElementTypeID>org.eclipse.papyrus.umldi.Dependency_BranchEdge</excludedElementTypeID>
+  <excludedElementTypeID>org.eclipse.papyrus.umldi.Dependency_Shape</excludedElementTypeID>
   <relationshipTypeID>org.eclipse.papyrus.example.j2ee.Import</relationshipTypeID>
   <relationshipTypeID>org.eclipse.papyrus.example.j2ee.Web</relationshipTypeID>
 </assistant:ModelingAssistantProvider>
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants
index a605fb70a24..af417699996 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="ASCII"?>
 <assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" name="j2ee">
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Classifier" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Default Named Element" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint Constrained Element" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape_CCN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.umldi.Component_Shape_CCN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape_CCN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.umldi.Component_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_ClassifierShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Classifier" elementTypeID="org.eclipse.papyrus.umldi.Classifier_SubjectShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Default Named Element" elementTypeID="org.eclipse.papyrus.umldi.NamedElement_DefaultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint Constrained Element" elementTypeID="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_UseCaseDiagram"/>
   <ownedFilter xsi:type="filters:CompoundFilter" name="pertains to Profile j2ee" filter="//@ownedFilter.21/@ownedFilter.0 //@ownedFilter.21/@ownedFilter.1" operator="or">
     <ownedFilter xsi:type="umlfilters:ProfileApplied" name="j2ee is applied in context" profileQualifiedName="j2ee" profileURI="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/>
     <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
   </ownedFilter>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Association" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Association" elementTypeID="org.eclipse.papyrus.umldi.Association_Edge"/>
   <popupAssistant elementTypeID="org.eclipse.papyrus.example.j2ee.User_3018" filter="//@popupAssistant.0/@ownedFilter">
     <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@popupAssistant.0/@ownedFilter/@ownedFilter.0">
       <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.3 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.16 //@ownedFilter.20" operator="or"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
index 2ef8577d458..9cdeee385d5 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
@@ -1,182 +1,183 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">

-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>

-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>

-    <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

-    </matcherConfiguration>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">

-      <requiredProfiles>j2ee</requiredProfiles>

-    </stereotypesToApply>

-  </adviceBindingsConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013">
+    <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Dependency_Edge</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011">
+    <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Association_Edge</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018">
+    <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CCN</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011">
+    <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CN</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011">
+    <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012">
+    <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_ClassifierShape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018">
+    <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CCN</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011">
+    <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CN</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011">
+    <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012">
+    <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Actor_ClassifierShape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007">
+    <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008">
+    <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012">
+    <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_Shape_CN</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013">
+    <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_Shape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014">
+    <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_ClassifierShape</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ">
+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ">
+    <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true">
+      <requiredProfiles>j2ee</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java
index 84f1969c31f..80b680d83c5 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java
@@ -49,7 +49,7 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		List<IElementType> types = getTypesForPopupBar(usecase);
 
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint"), hasID("org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint"), hasID("org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel")))));
 	}
 
 	@Test
@@ -59,9 +59,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 
 		// Both visual presentations of a use case (as ellipse and as classifier) for the WebScenario stereotype
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape")))));
 	}
 
 	@Test
@@ -70,9 +70,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		List<IElementType> types = getRelTypesOnSource(usecase);
 
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge")))));
 	}
 
 	@Test
@@ -81,9 +81,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		List<IElementType> types = getRelTypesOnTarget(usecase);
 
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge")))));
 	}
 
 	@Test
@@ -93,45 +93,45 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		List<IElementType> types = getRelTypesOnSourceAndTarget(usecase, actor);
 
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge")))));
 	}
 
 	@Test
 	public void targetForConnectionFromSource() {
 		IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1"));
-		List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.uml.diagram.usecase.Association_4011"));
+		List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.umldi.Association_Edge"));
 
 		// A couple of use case presentations (ellipse and classifier)
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape")))));
 
 		// A couple of actor presentations (stick-man and classifier)
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2011")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_Shape")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2012")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_ClassifierShape")))));
 	}
 
 	@Test
 	public void sourceForConnectionToTarget() {
 		IAdaptable actor = getEditPartSurrogate(getActor("User1"));
-		List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"));
+		List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.umldi.Dependency_Edge"));
 
 		// A couple of use case presentations (ellipse and classifier)
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape")))));
 
 		// A couple of actor presentations (stick-man and classifier)
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2011")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_Shape")))));
 		assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and(
-				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2012")))));
+				isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_ClassifierShape")))));
 	}
 
 	@Test
@@ -139,8 +139,8 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1"));
 		List<IElementType> types = getRelTypesOnSource(usecase);
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019"))));
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge"))));
 	}
 
 	@Test
@@ -148,8 +148,8 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		IAdaptable actor = getEditPartSurrogate(getActor("User1"));
 		List<IElementType> types = getRelTypesOnTarget(actor);
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019"))));
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge"))));
 	}
 
 	@Test
@@ -158,24 +158,24 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		IAdaptable actor = getEditPartSurrogate(getActor("User1"));
 		List<IElementType> types = getRelTypesOnSourceAndTarget(usecase, actor);
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019"))));
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge"))));
 	}
 
 	@Test
 	public void excludedTargetForConnectionFromSource() {
 		IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1"));
-		List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.uml.diagram.usecase.Association_4011"));
+		List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.umldi.Association_Edge"));
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_2015"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_Shape"))));
 	}
 
 	@Test
 	public void excludedSourceForConnectionToTarget() {
 		IAdaptable actor = getEditPartSurrogate(getActor("User1"));
-		List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"));
+		List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.umldi.Dependency_Edge"));
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_Shape"))));
 	}
 
 	@Test
@@ -183,7 +183,7 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss
 		IAdaptable diagram = getDiagramEditPartSurrogate();
 		List<IElementType> types = getTypesForPopupBar(diagram);
 
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_2015"))));
-		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_Shape"))));
+		assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_Shape"))));
 	}
 }
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
index 49bc8a699c4..35e27236b7c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,32 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

- org.junit;bundle-version="4.11.0",

- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

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

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",

- org.eclipse.gmf.codegen;bundle-version="2.11.0"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,

- org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
+ org.eclipse.gmf.codegen;bundle-version="2.11.0",
+ org.eclipse.papyrus.gmfgenextension;bundle-version="2.0.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
index 962518a4d52..8c3532b2aff 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
@@ -54,13 +54,11 @@ import org.eclipse.gef.RequestConstants;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
 import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
+import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
 import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
 import org.eclipse.gmf.codegen.gmfgen.GenLink;
 import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.gmf.codegen.gmfgen.util.GMFGenSwitch;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
@@ -95,6 +93,9 @@ import org.eclipse.papyrus.junit.utils.JUnitUtils;
 import org.eclipse.papyrus.junit.utils.rules.AnnotationRule;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
 import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.papyrusgmfgenextension.PapyrusgmfgenextensionPackage;
+import org.eclipse.papyrus.papyrusgmfgenextension.VisualIDOverride;
+import org.eclipse.papyrus.papyrusgmfgenextension.util.PapyrusgmfgenextensionSwitch;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
@@ -758,45 +759,28 @@ public class AbstractCanonicalTest extends AbstractPapyrusTest {
 
 		try {
 			URI classdiagram = URI.createPlatformPluginURI(String.format("/%s/model/classdiagram.gmfgen", UMLDiagramEditorPlugin.ID), true);
-			GenEditorGenerator editor = UML2Util.load(rset, classdiagram, GMFGenPackage.eINSTANCE.getGenEditorGenerator());
-
-			GMFGenSwitch<Class<? extends View>> typeSwitch = new GMFGenSwitch<Class<? extends View>>() {
-
-				@Override
-				public Class<? extends View> caseGenDiagram(GenDiagram object) {
-					Class<? extends View> result = Diagram.class;
-					String visualID = Integer.toString(object.getVisualID());
-					map.put(visualID, result);
-					return result;
-				}
-
-				@Override
-				public Class<? extends View> caseGenTopLevelNode(GenTopLevelNode object) {
-					Class<? extends View> result = Node.class;
-					String visualID = Integer.toString(object.getVisualID());
-					map.put(visualID, result);
-					return result;
-				}
-
-				@Override
-				public Class<? extends View> caseGenChildNode(GenChildNode object) {
-					Class<? extends View> result = Node.class;
-					String visualID = Integer.toString(object.getVisualID());
-					map.put(visualID, result);
-					return result;
-				}
+			VisualIDOverride ov = UML2Util.load(rset, classdiagram, PapyrusgmfgenextensionPackage.eINSTANCE.getVisualIDOverride());
+			PapyrusgmfgenextensionSwitch<Class<? extends View>> typeSwitch = new PapyrusgmfgenextensionSwitch<Class<? extends View>>() {
 
 				@Override
-				public Class<? extends View> caseGenLink(GenLink object) {
-					Class<? extends View> result = Edge.class;
-					String visualID = Integer.toString(object.getVisualID());
-					map.put(visualID, result);
+				public Class<? extends View> caseVisualIDOverride(VisualIDOverride object) {
+					Class<? extends View> result = null;
+					GenCommonBase base = object.getGenView();
+					if (base instanceof GenDiagram)
+						result = Diagram.class;
+					else if (base instanceof GenTopLevelNode)
+						result = Node.class;
+					else if (base instanceof GenChildNode)
+						result = Node.class;
+					else if (base instanceof GenLink)
+						result = Edge.class;
+					if (result != null)
+						map.put(object.getVisualID(), result);
 					return result;
 				}
 			};
 
-			map.put(editor.getModelID(), Diagram.class);
-			for (Iterator<? extends EObject> iter = editor.eAllContents(); iter.hasNext();) {
+			for (Iterator<? extends EObject> iter = ov.eAllContents(); iter.hasNext();) {
 				typeSwitch.doSwitch(iter.next());
 			}
 		} finally {
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch
index 5afacf2f348..e7fcca578a4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.commands.tests"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index dfdbcb3f064..71563f3dd83 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
  org.eclipse.papyrus.infra.gmfdiag.common.utils
 Bundle-Vendor: %providerName
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi
index 7068c1be528..459cd50c66c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="test AddBorderItem">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse representation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        subRepresentations="//@libraries.0/@representations.0"

-        reusedID="2008"/>

-  </usages>

-  <libraries

-      name="library">

-    <representations

-        xsi:type="expansionmodel:Representation"

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart"

-        name="Interface as BorderItem"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"

-        graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="test AddBorderItem">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse representation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        subRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="library">
+    <representations
+        xsi:type="expansionmodel:Representation"
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart"
+        name="Interface as BorderItem"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"
+        graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi
index 42ebf63e0f6..ae0d17f64d9 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="AddChildLabel">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse representation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        inducedRepresentations="//@libraries.0/@representations.0"

-        reusedID="2008"/>

-  </usages>

-  <libraries

-      name="compartmentlibrary">

-    <representations

-        xsi:type="expansionmodel:InducedRepresentation"

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"

-        name="Compartment to implement interfaces"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"

-        hint="Implemented Interfaces"

-        children="//@libraries.0/@representations.1"/>

-    <representations

-        xsi:type="expansionmodel:Representation"

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart"

-        name="Nested Interface Label"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"

-        graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="AddChildLabel">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse representation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        inducedRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="compartmentlibrary">
+    <representations
+        xsi:type="expansionmodel:InducedRepresentation"
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
+        name="Compartment to implement interfaces"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
+        hint="Implemented Interfaces"
+        children="//@libraries.0/@representations.1"/>
+    <representations
+        xsi:type="expansionmodel:Representation"
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart"
+        name="Nested Interface Label"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"
+        graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi
index 9a9ca8b983f..6103fdb57d8 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="Add CompartmentText">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse respresentation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        inducedRepresentations="//@libraries.0/@representations.0"

-        reusedID="2008"/>

-  </usages>

-  <libraries

-      name="compartmentlibrary">

-    <representations

-        xsi:type="expansionmodel:InducedRepresentation"

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"

-        name="Compartment to implement interfaces"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"

-        hint="Implemented Interfaces"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="Add CompartmentText">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse respresentation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        inducedRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="compartmentlibrary">
+    <representations
+        xsi:type="expansionmodel:InducedRepresentation"
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
+        name="Compartment to implement interfaces"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
+        hint="Implemented Interfaces"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi
index ed245656225..ee6c736c9ff 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<expansionmodel:DiagramExpansion

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:expansionmodel="http:///expansionmodel.ecore"

-    xmi:id="_BOX98NnkEeSFtu511b-yaw"

-    ID="Add CompartmentText">

-  <usages diagramType="Class Diagram"

-      representations="//@usages.0/@gmftRepresentations.0"

-      name="Add acomparment on class of papyrus">

-    <gmftRepresentations

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"

-        name="Reuse respresentation of class of the class diagram"

-        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"

-        inducedRepresentations="//@libraries.0/@representations.0"

-        reusedID="2008"/>

-  </usages>

-  <libraries

-      name="compartmentlibrary">

-    <representationkinds

-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"

-        name="ListCompartment"

-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/>

-    <representations

-        xsi:type="expansionmodel:InducedRepresentation"

-        kind="//@libraries.0/@representationkinds.0"

-        name="Compartment to implement interfaces"

-        hint="Implemented Interfaces"/>

-  </libraries>

-</expansionmodel:DiagramExpansion>

+<?xml version="1.0" encoding="UTF-8"?>
+<expansionmodel:DiagramExpansion
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:expansionmodel="http:///expansionmodel.ecore"
+    xmi:id="_BOX98NnkEeSFtu511b-yaw"
+    ID="Add CompartmentText">
+  <usages diagramType="Class Diagram"
+      representations="//@usages.0/@gmftRepresentations.0"
+      name="Add acomparment on class of papyrus">
+    <gmftRepresentations
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
+        name="Reuse respresentation of class of the class diagram"
+        viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
+        inducedRepresentations="//@libraries.0/@representations.0"
+        reusedID="Class_Shape"/>
+  </usages>
+  <libraries
+      name="compartmentlibrary">
+    <representationkinds
+        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
+        name="ListCompartment"
+        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/>
+    <representations
+        xsi:type="expansionmodel:InducedRepresentation"
+        kind="//@libraries.0/@representationkinds.0"
+        name="Compartment to implement interfaces"
+        hint="Implemented Interfaces"/>
+  </libraries>
+</expansionmodel:DiagramExpansion>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
index 1fa43d567e3..007cff1837c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="5029"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="8510">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_0OWQIOKJEeSwE5hduTH6nQ" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OWQJOKJEeSwE5hduTH6nQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_0OWQJeKJEeSwE5hduTH6nQ" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3MuKJEeSwE5hduTH6nQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_0OW3M-KJEeSwE5hduTH6nQ" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="5029"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="8510">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zwhnsPPMEeSh3rAaWaQzhQ" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhntPPMEeSh3rAaWaQzhQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zwhntfPMEeSh3rAaWaQzhQ" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnufPMEeSh3rAaWaQzhQ"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_zwhnuvPMEeSh3rAaWaQzhQ" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnvvPMEeSh3rAaWaQzhQ"/>

-    </children>

-    <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ">

-    <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-  </styles>

-  <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrHXgOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OWQJOKJEeSwE5hduTH6nQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrH-kOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3MuKJEeSwE5hduTH6nQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrIloOumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrJMsOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhntPPMEeSh3rAaWaQzhQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrJzwOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnufPMEeSh3rAaWaQzhQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_XrKa0OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnvvPMEeSh3rAaWaQzhQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ">
+    <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+  </styles>
+  <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
index 110358d14ce..4a7f85b1969 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" name="PapyrusUMLClassDiagram">

-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"/>

+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape"/>

   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="MyNestedInterface" elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>

   <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>

   <popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" filter="//@ownedFilter.0"/>

-  <elementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</elementTypeID>

+  <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape</elementTypeID>

   <elementTypeID>org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label</elementTypeID>

 </assistant:ModelingAssistantProvider>

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation
index 3da2a18ea38..3ef8ea04d7e 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_SUe9MP4pEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="master" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_dtgq8P4pEeSWkpIORzCK6w" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgP4pEeSWkpIORzCK6w" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgf4pEeSWkpIORzCK6w" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_dtgq8P4pEeSWkpIORzCK6w" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgP4pEeSWkpIORzCK6w" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgf4pEeSWkpIORzCK6w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_dtmKgv4pEeSWkpIORzCK6w" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDAP4pEeSWkpIORzCK6w" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzAJ8OumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDAf4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDAv4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDA_4pEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtrDBP4pEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDBf4pEeSWkpIORzCK6w" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDBv4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDB_4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDCP4pEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtrDCf4pEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDCv4pEeSWkpIORzCK6w" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAeumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDC_4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDDP4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDDf4pEeSWkpIORzCK6w"/>
@@ -27,24 +27,24 @@
       <element xmi:type="uml:Class" href="sync-test.uml#_dtT2oP4pEeSWkpIORzCK6w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dthSAP4pEeSWkpIORzCK6w" x="76" y="79"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_e3LowP4pEeSWkpIORzCK6w" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_e3Lowv4pEeSWkpIORzCK6w" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_e3Low_4pEeSWkpIORzCK6w" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_e3LowP4pEeSWkpIORzCK6w" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_e3Lowv4pEeSWkpIORzCK6w" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_e3Low_4pEeSWkpIORzCK6w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_e3LoxP4pEeSWkpIORzCK6w" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP0P4pEeSWkpIORzCK6w" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAuumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP0f4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP0v4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP0_4pEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3MP1P4pEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP1f4pEeSWkpIORzCK6w" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzBYEOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP1v4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP1_4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP2P4pEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3MP2f4pEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP2v4pEeSWkpIORzCK6w" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_pzBYEeumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP2_4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP3P4pEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP3f4pEeSWkpIORzCK6w"/>
@@ -53,7 +53,7 @@
       <element xmi:type="uml:Class" href="sync-test.uml#_e3FiIP4pEeSWkpIORzCK6w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3Lowf4pEeSWkpIORzCK6w" x="216" y="289"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_SUe9Mf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_SUe9Mf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_SUe9Mv4pEeSWkpIORzCK6w"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_SUe9M_4pEeSWkpIORzCK6w">
       <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
@@ -62,23 +62,23 @@
       <stringListValue>syncmaster</stringListValue>
     </styles>
     <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_jKtTcP4pEeSWkpIORzCK6w" type="4001" source="_dtgq8P4pEeSWkpIORzCK6w" target="_e3LowP4pEeSWkpIORzCK6w">
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gP4pEeSWkpIORzCK6w" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_jKtTcP4pEeSWkpIORzCK6w" type="Association_Edge" source="_dtgq8P4pEeSWkpIORzCK6w" target="_e3LowP4pEeSWkpIORzCK6w">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gP4pEeSWkpIORzCK6w" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKt6gf4pEeSWkpIORzCK6w" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gv4pEeSWkpIORzCK6w" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gv4pEeSWkpIORzCK6w" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKt6g_4pEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkP4pEeSWkpIORzCK6w" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkP4pEeSWkpIORzCK6w" type="Association_TargetRoleLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhkf4pEeSWkpIORzCK6w" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkv4pEeSWkpIORzCK6w" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkv4pEeSWkpIORzCK6w" type="Association_SourceRoleLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhk_4pEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlP4pEeSWkpIORzCK6w" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlP4pEeSWkpIORzCK6w" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhlf4pEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlv4pEeSWkpIORzCK6w" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlv4pEeSWkpIORzCK6w" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhl_4pEeSWkpIORzCK6w" y="-20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_jKtTcf4pEeSWkpIORzCK6w"/>
@@ -89,7 +89,7 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_yVolgP4pEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="slave1" measurementUnit="Pixel">
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_yVolgf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_yVolgf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_yVolgv4pEeSWkpIORzCK6w"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_yVolg_4pEeSWkpIORzCK6w">
       <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
@@ -100,24 +100,24 @@
     <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
   </notation:Diagram>
   <notation:Diagram xmi:id="_ytSpAP5UEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="slave2" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_ytSpAf5UEeSWkpIORzCK6w" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpAv5UEeSWkpIORzCK6w" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpA_5UEeSWkpIORzCK6w" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_ytSpAf5UEeSWkpIORzCK6w" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpAv5UEeSWkpIORzCK6w" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpA_5UEeSWkpIORzCK6w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpBP5UEeSWkpIORzCK6w" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpBf5UEeSWkpIORzCK6w" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trYwwOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpBv5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpB_5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpCP5UEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpCf5UEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpCv5UEeSWkpIORzCK6w" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0OumEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpC_5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpDP5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpDf5UEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpDv5UEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpD_5UEeSWkpIORzCK6w" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0eumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpEP5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpEf5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpEv5UEeSWkpIORzCK6w"/>
@@ -126,24 +126,24 @@
       <element xmi:type="uml:Class" href="sync-test.uml#_dtT2oP4pEeSWkpIORzCK6w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpFP5UEeSWkpIORzCK6w" x="76" y="79"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_ytSpFf5UEeSWkpIORzCK6w" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpFv5UEeSWkpIORzCK6w" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpF_5UEeSWkpIORzCK6w" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_ytSpFf5UEeSWkpIORzCK6w" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpFv5UEeSWkpIORzCK6w" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpF_5UEeSWkpIORzCK6w" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpGP5UEeSWkpIORzCK6w" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpGf5UEeSWkpIORzCK6w" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0uumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpGv5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpG_5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpHP5UEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpHf5UEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpHv5UEeSWkpIORzCK6w" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0-umEeW_9Ltteg9fQQ" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpH_5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpIP5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpIf5UEeSWkpIORzCK6w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpIv5UEeSWkpIORzCK6w"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpI_5UEeSWkpIORzCK6w" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_trZ-4OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpJP5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpJf5UEeSWkpIORzCK6w"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpJv5UEeSWkpIORzCK6w"/>
@@ -152,7 +152,7 @@
       <element xmi:type="uml:Class" href="sync-test.uml#_e3FiIP4pEeSWkpIORzCK6w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpKP5UEeSWkpIORzCK6w" x="216" y="289"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ytSpKf5UEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ytSpKf5UEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_ytSpKv5UEeSWkpIORzCK6w"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ytSpK_5UEeSWkpIORzCK6w">
       <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
@@ -161,23 +161,23 @@
       <stringListValue>syncslave</stringListValue>
     </styles>
     <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_ytSpLf5UEeSWkpIORzCK6w" type="4001" source="_ytSpAf5UEeSWkpIORzCK6w" target="_ytSpFf5UEeSWkpIORzCK6w">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpLv5UEeSWkpIORzCK6w" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_ytSpLf5UEeSWkpIORzCK6w" type="Association_Edge" source="_ytSpAf5UEeSWkpIORzCK6w" target="_ytSpFf5UEeSWkpIORzCK6w">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpLv5UEeSWkpIORzCK6w" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpL_5UEeSWkpIORzCK6w" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMP5UEeSWkpIORzCK6w" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMP5UEeSWkpIORzCK6w" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpMf5UEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMv5UEeSWkpIORzCK6w" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMv5UEeSWkpIORzCK6w" type="Association_TargetRoleLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpM_5UEeSWkpIORzCK6w" y="-20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNP5UEeSWkpIORzCK6w" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNP5UEeSWkpIORzCK6w" type="Association_SourceRoleLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpNf5UEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNv5UEeSWkpIORzCK6w" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNv5UEeSWkpIORzCK6w" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpN_5UEeSWkpIORzCK6w" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpOP5UEeSWkpIORzCK6w" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ytSpOP5UEeSWkpIORzCK6w" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpOf5UEeSWkpIORzCK6w" y="-20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_ytSpOv5UEeSWkpIORzCK6w"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java
index d61f5a6c7c2..ee8eb964cd1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java
@@ -24,8 +24,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
@@ -35,7 +34,6 @@ import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.core.IModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.DefaultModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.ModelingAssistantModelRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.util.ProxyElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor;
 import org.eclipse.papyrus.infra.gmfdiag.common.expansion.ChildrenListRepresentation;
 import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionSingleton;
@@ -44,6 +42,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
 import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -83,7 +82,7 @@ public class AssistantUsage extends AbstractEditorTest {
 	/**
 	 * 
 	 */
-	protected static final String CLASS_VISUALID = "2008";
+	protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID;
 	/**
 	 * 
 	 */
@@ -102,9 +101,9 @@ public class AssistantUsage extends AbstractEditorTest {
 		Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation);
 		Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID));
 		Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT));
-		List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
-		Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size());
-		Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0));
+		List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
+		Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size());
+		Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0));
 
 		Assert.assertNotNull("The Nested Interface has to be added", childrenListRepresentation.IDMap.get(NESTED_INTERFACE_LABEL));
 		List<String> the_IMPLEMENTED_INTERFACES_Children = childrenListRepresentation.parentChildrenRelation.get(IMPLEMENTED_INTERFACES_HINT);
@@ -129,13 +128,13 @@ public class AssistantUsage extends AbstractEditorTest {
 
 			// test in the notation
 			View classNotationView = classEditPart.getNotationView();
-			Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008");
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
+			Assert.assertEquals("the class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID);
+			Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
 			View compartment = (View) classNotationView.getPersistedChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType());
 
 			// test in the editpart is created for this notation
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType());
 
@@ -149,31 +148,29 @@ public class AssistantUsage extends AbstractEditorTest {
 			Assert.assertNotNull("the assistant model must be loaded", result);
 			ModelingAssistantModelRegistry.getInstance().loadModels(result);
 			// try to create a label inside this compartment.
-			final IElementType interfaceLabelelementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label");
 			List<?> types = ModelingAssistantService.getInstance().getTypesForPopupBar(classEditPart);
 			boolean founded = false;
 
 			// test the construction of the popupbar
 			for (Object object : types) {
-				if (object instanceof ProxyElementType) {
-					ProxyElementType proxyElementType = (ProxyElementType) object;
-					System.out.println(proxyElementType);
+				if (object instanceof ISpecializationType) {
+					ISpecializationType elementType = (ISpecializationType) object;
+					System.out.println(elementType);
 
 
-					if (("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label".equals(proxyElementType.getId()))
-							&& interfaceLabelelementType.equals(proxyElementType.resolveSemanticType())
-							&& interfaceLabelelementType.equals(proxyElementType.resolveVisualType())) {
+					if (("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label".equals(elementType.getId()))) {
 
 						// find the good short cut
 						founded = true;
 						// now construct the request and command to simulate the display inside popup bar
-						Request req = CreateViewRequestFactory.getCreateShapeRequest(proxyElementType,
+						Request req = CreateViewRequestFactory.getCreateShapeRequest(elementType,
 								classEditPart.getDiagramPreferencesHint());
 						EditPart targetEditpart = classEditPart.getTargetEditPart(req);
 						Assert.assertEquals("the request must be redirect to compartment", compartmentEdiPart, targetEditpart);
 						Command cmd = targetEditpart.getCommand(req);
 						Assert.assertNotNull("The command must not be null", cmd);
 						Assert.assertTrue("The command must be executable", cmd.canExecute());
+						break;
 					}
 				}
 			}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java
index 6697e147972..9f899509eaa 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionsRegis
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
 import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -72,7 +73,7 @@ public class ExpansionAddBorderItem extends AbstractEditorTest {
 	/**
 	 * 
 	 */
-	protected static final String CLASS_VISUALID = "2008";
+	protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID;
 	/**
 	 * 
 	 */
@@ -92,9 +93,9 @@ public class ExpansionAddBorderItem extends AbstractEditorTest {
 		Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID));
 
 		Assert.assertNotNull("The BorderItem of class has been added", childrenListRepresentation.IDMap.get(INTERFACE_BORDER_ITEM));
-		List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
-		Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size());
-		Assert.assertEquals("2008 has to contain " + INTERFACE_BORDER_ITEM, INTERFACE_BORDER_ITEM, the_2008_Children.get(0));
+		List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
+		Assert.assertEquals("Class shape can have a new compartment", 1, the_class_shape_Children.size());
+		Assert.assertEquals("Class shape has to contain " + INTERFACE_BORDER_ITEM, INTERFACE_BORDER_ITEM, the_class_shape_Children.get(0));
 
 		// the model is valid
 		// now launch a class diagram
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java
index f7e1c9197a0..824ee28f388 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
 import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -79,7 +80,7 @@ public class ExpansionAddChildLabel extends AbstractEditorTest {
 	/**
 	 * 
 	 */
-	protected static final String CLASS_VISUALID = "2008";
+	protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID;
 	/**
 	 * 
 	 */
@@ -98,9 +99,9 @@ public class ExpansionAddChildLabel extends AbstractEditorTest {
 		Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation);
 		Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID));
 		Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT));
-		List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
-		Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size());
-		Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0));
+		List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
+		Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size());
+		Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0));
 
 		Assert.assertNotNull("The Nested Interface has to be added", childrenListRepresentation.IDMap.get(NESTED_INTERFACE_LABEL));
 		List<String> the_IMPLEMENTED_INTERFACES_Children = childrenListRepresentation.parentChildrenRelation.get(IMPLEMENTED_INTERFACES_HINT);
@@ -125,13 +126,13 @@ public class ExpansionAddChildLabel extends AbstractEditorTest {
 
 			// test in the notation
 			View classNotationView = classEditPart.getNotationView();
-			Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008");
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
+			Assert.assertEquals("the Type of class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID);
+			Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
 			View compartment = (View) classNotationView.getPersistedChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType());
 
 			// test in the editpart is created for this notation
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType());
 
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java
index 7363af14111..deb748f197a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
 import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -66,7 +67,7 @@ public class ExpansionAddCompartment extends AbstractEditorTest {
 	/**
 	 * 
 	 */
-	protected static final String CLASS_VISUALID = "2008";
+	protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID;
 	/**
 	 * 
 	 */
@@ -85,9 +86,9 @@ public class ExpansionAddCompartment extends AbstractEditorTest {
 		Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation);
 		Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID));
 		Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT));
-		List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
-		Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size());
-		Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0));
+		List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
+		Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size());
+		Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0));
 
 		// the model is valid
 		// now launch a class diagram
@@ -107,13 +108,13 @@ public class ExpansionAddCompartment extends AbstractEditorTest {
 
 			// test in the notation
 			View classNotationView = classEditPart.getNotationView();
-			Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008");
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
+			Assert.assertEquals("the Type of class editpart is not correct", classNotationView.getType(), ClassEditPart.VISUAL_ID);
+			Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
 			View compartment = (View) classNotationView.getPersistedChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType());
 
 			// test in the editpart is created for this notation
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5);
 			if (compartmentEdiPart.getNotationView().equals(compartment)) {
 				Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType());
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java
index e58fc89830c..a9c82f77726 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
 import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -66,7 +67,7 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest {
 	/**
 	 * 
 	 */
-	protected static final String CLASS_VISUALID = "2008";
+	protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID;
 	/**
 	 * 
 	 */
@@ -85,9 +86,9 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest {
 		Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation);
 		Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID));
 		Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT));
-		List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
-		Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size());
-		Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0));
+		List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID);
+		Assert.assertEquals("Class shape can have a new compartment", 1, the_class_shape_Children.size());
+		Assert.assertEquals("Class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0));
 
 		// the model is valid
 		// now launch a class diagram
@@ -107,13 +108,13 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest {
 
 			// test in the notation
 			View classNotationView = classEditPart.getNotationView();
-			Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008");
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
+			Assert.assertEquals("the Type of class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID);
+			Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6);
 			View compartment = (View) classNotationView.getPersistedChildren().get(5);
 			Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType());
 
 			// test in the editpart is created for this notation
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5);
 			if (compartmentEdiPart.getNotationView().equals(compartment)) {
 				Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType());
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java
index 39b3ddd3375..a27f71ba811 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java
@@ -111,7 +111,7 @@ public class ExpansionDropElements extends AbstractEditorTest {
 			Assert.assertNotNull("MyClass must have a nested Interface called --MyNestedInterface--", nestedInterface);
 
 			// try to drop on my class
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPartMyClass = (IGraphicalEditPart) myclassEditPart.getChildren().get(5);
 			Assert.assertEquals("the compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPartMyClass.getNotationView().getType());
 
@@ -168,7 +168,7 @@ public class ExpansionDropElements extends AbstractEditorTest {
 			Assert.assertNotNull("MyClass must have a nested Interface called --MyNestedInterface--", nestedInterface);
 
 			// try to drop on my class
-			Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6);
+			Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6);
 			IGraphicalEditPart compartmentEdiPartMyOtherClass = (IGraphicalEditPart) myOtherclassEditPart.getChildren().get(5);
 			Assert.assertEquals("the compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPartMyOtherClass.getNotationView().getType());
 
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java
index 6747931d3eb..4d2f46fff41 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java
@@ -24,6 +24,11 @@ import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.Shape;
 import org.eclipse.gmf.runtime.notation.TitleStyle;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
 
 /**
  * 
@@ -34,10 +39,10 @@ public class ClassifierViewFactory implements ViewFactory {
 
 	public View createView(IAdaptable semanticAdapter, View containerView, String semanticHint, int index,
 			boolean persisted, PreferencesHint preferencesHint) {
-		return createClass_2008((EObject) semanticAdapter.getAdapter(EObject.class), containerView, semanticHint, index, persisted, preferencesHint);
+		return createClass_Shape((EObject) semanticAdapter.getAdapter(EObject.class), containerView, semanticHint, index, persisted, preferencesHint);
 	}
 
-	public Node createClass_2008(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
+	public Node createClass_Shape(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
 		Shape node = NotationFactory.eINSTANCE.createShape();
 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
 		node.setType(semanticHint);
@@ -45,15 +50,15 @@ public class ClassifierViewFactory implements ViewFactory {
 		node.setElement(domainElement);
 		// initializeFromPreferences
 
-		Node label5029 = createLabel(node, "5029");
-		Node label8510 = createLabel(node, "8510");
-		label8510.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location8510 = (Location) label8510.getLayoutConstraint();
-		location8510.setX(0);
-		location8510.setY(5);
-		createCompartment(node, "7017", true, true, true, true);
-		createCompartment(node, "7018", true, true, true, true);
-		createCompartment(node, "7019", true, true, true, true);
+		Node classNamelabel = createLabel(node, ClassNameEditPart.VISUAL_ID);
+		Node classFloatingNamelabel = createLabel(node, ClassFloatingNameEditPart.VISUAL_ID);
+		classFloatingNamelabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
+		Location classFloatingNameLabelLocation = (Location) classFloatingNamelabel.getLayoutConstraint();
+		classFloatingNameLabelLocation.setX(0);
+		classFloatingNameLabelLocation.setY(5);
+		createCompartment(node, ClassAttributeCompartmentEditPart.VISUAL_ID, true, true, true, true);
+		createCompartment(node, ClassOperationCompartmentEditPart.VISUAL_ID, true, true, true, true);
+		createCompartment(node, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, true, true, true, true);
 		return node;
 	}
 
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
index bcb8a60d6fc..5316f5ad496 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.core.resources;bundle-version="3.8.0",

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

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,

- org.eclipse.papyrus.infra.gmfdiag.css.tests.tests

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS Tests

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="2.0.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,
+ org.eclipse.papyrus.infra.gmfdiag.css.tests.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: CSS Tests
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch
index 5355537d5fc..ad3d47d22b1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M&#13;&#10;-Doomph.setup.skip=true&#13;&#10;-Doomph.setup.questionnaire.skip=true"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M&#13;&#10;-Doomph.setup.skip=true&#13;&#10;-Doomph.setup.questionnaire.skip=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation
index ad421b8149b..895b860a7c0 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation
@@ -1,57 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_PHIj4HTIEeG92qGoaUUGLQ" type="2004" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHIj4nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj43TIEeG92qGoaUUGLQ" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5HTIEeG92qGoaUUGLQ" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5XTIEeG92qGoaUUGLQ" key="italic" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5nTIEeG92qGoaUUGLQ" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj53TIEeG92qGoaUUGLQ" key="fillColor" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4HTIEeG92qGoaUUGLQ" source="ShadowFigure">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU4XTIEeG92qGoaUUGLQ" key="ShadowFigure_Value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4nTIEeG92qGoaUUGLQ" source="displayNameLabelIcon">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU43TIEeG92qGoaUUGLQ" key="displayNameLabelIcon_value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU5HTIEeG92qGoaUUGLQ" source="QualifiedName">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU5XTIEeG92qGoaUUGLQ" key="QualifiedNameDepth" value="1000"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_PHSU5nTIEeG92qGoaUUGLQ" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU53TIEeG92qGoaUUGLQ" type="7006">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP0HTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP0XTIEeG92qGoaUUGLQ" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU6HTIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU6XTIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU6nTIEeG92qGoaUUGLQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU63TIEeG92qGoaUUGLQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU7HTIEeG92qGoaUUGLQ" type="7007">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP0nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP03TIEeG92qGoaUUGLQ" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU7XTIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU7nTIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU73TIEeG92qGoaUUGLQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU8HTIEeG92qGoaUUGLQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU8XTIEeG92qGoaUUGLQ" type="7008">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP1HTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP1XTIEeG92qGoaUUGLQ" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU8nTIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU83TIEeG92qGoaUUGLQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU9HTIEeG92qGoaUUGLQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU9XTIEeG92qGoaUUGLQ"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_PGr38HTIEeG92qGoaUUGLQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHIj4XTIEeG92qGoaUUGLQ" x="271" y="159"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/>

-    <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/>

-  </notation:Diagram>

-  <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_PHIj4HTIEeG92qGoaUUGLQ" type="Interface_Shape" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHIj4nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj43TIEeG92qGoaUUGLQ" key="fontHeight" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5HTIEeG92qGoaUUGLQ" key="bold" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5XTIEeG92qGoaUUGLQ" key="italic" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5nTIEeG92qGoaUUGLQ" key="fontColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj53TIEeG92qGoaUUGLQ" key="fillColor" value="true"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4HTIEeG92qGoaUUGLQ" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU4XTIEeG92qGoaUUGLQ" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4nTIEeG92qGoaUUGLQ" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU43TIEeG92qGoaUUGLQ" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU5HTIEeG92qGoaUUGLQ" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU5XTIEeG92qGoaUUGLQ" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHSU5nTIEeG92qGoaUUGLQ" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7DgGwOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU6HTIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU6XTIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU6nTIEeG92qGoaUUGLQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU63TIEeG92qGoaUUGLQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7DhU4Ou5EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU7XTIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU7nTIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU73TIEeG92qGoaUUGLQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU8HTIEeG92qGoaUUGLQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7Dh78Ou5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU8nTIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU83TIEeG92qGoaUUGLQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU9HTIEeG92qGoaUUGLQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU9XTIEeG92qGoaUUGLQ"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_PGr38HTIEeG92qGoaUUGLQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHIj4XTIEeG92qGoaUUGLQ" x="271" y="159"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_7DjxIOu5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/>
+  </notation:Diagram>
+  <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation
index d76d49cb8c9..1296bc7ceda 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation
@@ -1,258 +1,260 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_4EGG0ImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="compartments" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Cz4qUImWEeOGN4dVepS-Uw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Cz4qUomWEeOGN4dVepS-Uw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qU4mWEeOGN4dVepS-Uw" type="7017">

-        <children xmi:type="notation:Shape" xmi:id="_U81zwYmWEeOGN4dVepS-Uw" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_U81zwImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_U81zwomWEeOGN4dVepS-Uw"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_VDYgoYmWEeOGN4dVepS-Uw" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_VDYgoImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VDYgoomWEeOGN4dVepS-Uw"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_VJCcsYmWEeOGN4dVepS-Uw" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_VJCcsImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VJCcsomWEeOGN4dVepS-Uw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qVImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qVYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qVomWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qV4mWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qWImWEeOGN4dVepS-Uw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qWYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qWomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qW4mWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qXImWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qXYmWEeOGN4dVepS-Uw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qXomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qX4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qYImWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qYYmWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cpYD0ImlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cpYD0YmlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cpYD0omlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_CzvgYImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qUYmWEeOGN4dVepS-Uw" x="45" y="70" width="169"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_DZrfAYmWEeOGN4dVepS-Uw" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_DZrfA4mWEeOGN4dVepS-Uw" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfBImWEeOGN4dVepS-Uw" type="7006">

-        <children xmi:type="notation:Shape" xmi:id="_V6u_YYmWEeOGN4dVepS-Uw" type="3006">

-          <element xmi:type="uml:Property" href="model.uml#_V6u_YImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_V6u_YomWEeOGN4dVepS-Uw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfBYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfBomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfB4mWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfCImWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfCYmWEeOGN4dVepS-Uw" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfComWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfC4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfDImWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfDYmWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfDomWEeOGN4dVepS-Uw" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfD4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfEImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfEYmWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfEomWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cp95sImlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cp95sYmlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cp95somlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_DZrfAImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfAomWEeOGN4dVepS-Uw" x="680" y="67"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Dp5FQImWEeOGN4dVepS-Uw" type="2006">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Dp5FQomWEeOGN4dVepS-Uw" type="5023"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Dp5FQ4mWEeOGN4dVepS-Uw" type="7015">

-        <children xmi:type="notation:Shape" xmi:id="_EAp_cImWEeOGN4dVepS-Uw" type="3017">

-          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_EAgOcImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_EAp_cYmWEeOGN4dVepS-Uw"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_ENAZYYmWEeOGN4dVepS-Uw" type="3017">

-          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_ENAZYImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ENAZYomWEeOGN4dVepS-Uw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Dp5FRImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Dp5FRYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Dp5FRomWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FR4mWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqsImlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqsYmlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqsomlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Enumeration" href="model.uml#_DpvUQImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FQYmWEeOGN4dVepS-Uw" x="36" y="431"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_az5twYmWEeOGN4dVepS-Uw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_az5tw4mWEeOGN4dVepS-Uw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_az5txImWEeOGN4dVepS-Uw" type="7017">

-        <children xmi:type="notation:Shape" xmi:id="_cSX24ImWEeOGN4dVepS-Uw" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_cSOF4ImWEeOGN4dVepS-Uw"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cSX24YmWEeOGN4dVepS-Uw"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_az5txYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_az5txomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tx4mWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tyImWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_az5tyYmWEeOGN4dVepS-Uw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_az5tyomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_az5ty4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tzImWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tzYmWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_az5tzomWEeOGN4dVepS-Uw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_az5tz4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_az5t0ImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5t0YmWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5t0omWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqs4mlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqtImlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqtYmlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_az5twImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5twomWEeOGN4dVepS-Uw" x="42" y="223" width="177" height="163"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_1epSEYmWEeOGN4dVepS-Uw" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1epSE4mWEeOGN4dVepS-Uw" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1epSFImWEeOGN4dVepS-Uw" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSFYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSFomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSF4mWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSGImWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1epSGYmWEeOGN4dVepS-Uw" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSGomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSG4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSHImWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSHYmWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1epSHomWEeOGN4dVepS-Uw" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSH4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSIImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSIYmWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSIomWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqtomlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqt4mlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHquImlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_1epSEImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSEomWEeOGN4dVepS-Uw" x="683" y="219"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_61R_kYmWEeOGN4dVepS-Uw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_61R_k4mWEeOGN4dVepS-Uw" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_61R_lImWEeOGN4dVepS-Uw" visible="false" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_lYmWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_lomWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_l4mWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_mImWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_61R_mYmWEeOGN4dVepS-Uw" visible="false" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_momWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_m4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_nImWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_nYmWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_61R_nomWEeOGN4dVepS-Uw" visible="false" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_n4mWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_oImWEeOGN4dVepS-Uw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_oYmWEeOGN4dVepS-Uw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_oomWEeOGN4dVepS-Uw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHquYmlEeO69MVKNB7cFw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHquomlEeO69MVKNB7cFw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqu4mlEeO69MVKNB7cFw"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_61R_kImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_komWEeOGN4dVepS-Uw" x="42" y="597" height="34"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9TcEEImWEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_9TcEEomWEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_9S_YIImWEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9TcEEYmWEeOGN4dVepS-Uw" x="309" y="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_D1WR4YmXEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_D1WR44mXEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_D1WR4ImXEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1WR4omXEeOGN4dVepS-Uw" x="353" y="588"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_TnYnQYmXEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_TnYnQ4mXEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_TnYnQImXEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TnYnQomXEeOGN4dVepS-Uw" x="360" y="457"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_anMSAYmXEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_anMSA4mXEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_anMSAImXEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anMSAomXEeOGN4dVepS-Uw" x="353" y="273" width="148"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Tfr8cYmaEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Tfr8c4maEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_Tfr8cImaEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="997" y="72" width="167"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_TlMukYmaEeOGN4dVepS-Uw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_TlV4gImaEeOGN4dVepS-Uw" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_TlMukImaEeOGN4dVepS-Uw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="881" y="248" width="149"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_4EGG0YmVEeOGN4dVepS-Uw"/>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_OgIPAImWEeOGN4dVepS-Uw" name="css_stylesheets" eObjectListValue="_OgIPAYmWEeOGN4dVepS-Uw"/>

-    <styles xmi:type="notation:StringListValueStyle" xmi:id="_PR97oImWEeOGN4dVepS-Uw" name="cssClass"/>

-    <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_BTVBEImXEeOGN4dVepS-Uw" type="4013" source="_9TcEEImWEeOGN4dVepS-Uw" target="_Cz4qUImWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_BTVBEYmXEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTVBEomXEeOGN4dVepS-Uw" points="[-35, 6, 146, -36]$[-97, -8, 84, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTeyEImXEeOGN4dVepS-Uw" id="(0.12323943661971831,0.31666666666666665)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_GP624ImXEeOGN4dVepS-Uw" type="4013" source="_D1WR4YmXEeOGN4dVepS-Uw" target="_61R_kYmWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_GP624YmXEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GP624omXEeOGN4dVepS-Uw" points="[-88, 4, 270, -13]$[-308, 18, 50, 1]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_UCAtwImXEeOGN4dVepS-Uw" type="4013" source="_TnYnQYmXEeOGN4dVepS-Uw" target="_Dp5FQImWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_UCAtwYmXEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UCAtwomXEeOGN4dVepS-Uw" points="[-16, 1, 271, -20]$[-237, 18, 50, -3]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UCKewImXEeOGN4dVepS-Uw" id="(0.16,0.35)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_bQjYEImXEeOGN4dVepS-Uw" type="4013" source="_anMSAYmXEeOGN4dVepS-Uw" target="_az5twYmWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_bQjYEYmXEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bQjYEomXEeOGN4dVepS-Uw" points="[-74, -1, 224, -18]$[-386, -47, -88, -64]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_YgJloImaEeOGN4dVepS-Uw" type="4013" source="_TlMukYmaEeOGN4dVepS-Uw" target="_1epSEYmWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_YgJloYmaEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YgJloomaEeOGN4dVepS-Uw" points="[-74, -6, 126, 1]$[-192, 45, 8, 52]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwLXCEeOtu7CRWiD6kg" id="(0.0,0.4)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwbXCEeOtu7CRWiD6kg" id="(1.0,0.56)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Y5mAYImaEeOGN4dVepS-Uw" type="4013" source="_Tfr8cYmaEeOGN4dVepS-Uw" target="_DZrfAYmWEeOGN4dVepS-Uw">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Y5mAYYmaEeOGN4dVepS-Uw"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5mAYomaEeOGN4dVepS-Uw" points="[-83, -1, 122, -8]$[-198, -48, 7, -55]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJELXCEeOtu7CRWiD6kg" id="(0.0,0.47)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJEbXCEeOtu7CRWiD6kg" id="(1.0,0.5)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_8JDKAImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="labels" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_8JDKAYmVEeOGN4dVepS-Uw"/>

-    <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>

-  </notation:Diagram>

-  <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="../../stylesheets/compartments.css"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_4EGG0ImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="compartments" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Cz4qUImWEeOGN4dVepS-Uw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Cz4qUomWEeOGN4dVepS-Uw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YKZ4Ou5EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_U81zwYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_U81zwImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U81zwomWEeOGN4dVepS-Uw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VDYgoYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_VDYgoImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VDYgoomWEeOGN4dVepS-Uw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VJCcsYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_VJCcsImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VJCcsomWEeOGN4dVepS-Uw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qVImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qVYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qVomWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qV4mWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YLoAOu5EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qWYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qWomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qW4mWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qXImWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YMPEOu5EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qXomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qX4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qYImWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qYYmWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cpYD0ImlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cpYD0YmlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cpYD0omlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_CzvgYImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qUYmWEeOGN4dVepS-Uw" x="45" y="70" width="169"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_DZrfAYmWEeOGN4dVepS-Uw" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DZrfA4mWEeOGN4dVepS-Uw" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YM2IOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_V6u_YYmWEeOGN4dVepS-Uw" type="Property_InterfaceAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_V6u_YImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V6u_YomWEeOGN4dVepS-Uw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfBYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfBomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfB4mWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfCImWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YOEQOu5EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfComWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfC4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfDImWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfDYmWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YOrUOu5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfD4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfEImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfEYmWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfEomWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cp95sImlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cp95sYmlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cp95somlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_DZrfAImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfAomWEeOGN4dVepS-Uw" x="680" y="67"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Dp5FQImWEeOGN4dVepS-Uw" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dp5FQomWEeOGN4dVepS-Uw" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YPSYOu5EeWb4rS4qgjiLg" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_EAp_cImWEeOGN4dVepS-Uw" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_EAgOcImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_EAp_cYmWEeOGN4dVepS-Uw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ENAZYYmWEeOGN4dVepS-Uw" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_ENAZYImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ENAZYomWEeOGN4dVepS-Uw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Dp5FRImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Dp5FRYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Dp5FRomWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FR4mWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqsImlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqsYmlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqsomlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="model.uml#_DpvUQImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FQYmWEeOGN4dVepS-Uw" x="36" y="431"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_az5twYmWEeOGN4dVepS-Uw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_az5tw4mWEeOGN4dVepS-Uw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YP5cOu5EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_cSX24ImWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_cSOF4ImWEeOGN4dVepS-Uw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cSX24YmWEeOGN4dVepS-Uw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_az5txYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_az5txomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tx4mWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tyImWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YQggOu5EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_az5tyomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_az5ty4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tzImWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tzYmWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YRHkOu5EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_az5tz4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_az5t0ImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_az5t0YmWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5t0omWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqs4mlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqtImlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqtYmlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_az5twImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5twomWEeOGN4dVepS-Uw" x="42" y="223" width="177" height="163"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1epSEYmWEeOGN4dVepS-Uw" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1epSE4mWEeOGN4dVepS-Uw" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YRuoOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSFYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSFomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSF4mWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSGImWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YSVsOu5EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSGomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSG4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSHImWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSHYmWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YS8wOu5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1epSH4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1epSIImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSIYmWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSIomWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqtomlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqt4mlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHquImlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_1epSEImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSEomWEeOGN4dVepS-Uw" x="683" y="219"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_61R_kYmWEeOGN4dVepS-Uw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_61R_k4mWEeOGN4dVepS-Uw" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YS8weu5EeWb4rS4qgjiLg" visible="false" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_lYmWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_lomWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_l4mWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_mImWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YS8wuu5EeWb4rS4qgjiLg" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_momWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_m4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_nImWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_nYmWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__YS8w-u5EeWb4rS4qgjiLg" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_61R_n4mWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_61R_oImWEeOGN4dVepS-Uw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_oYmWEeOGN4dVepS-Uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_oomWEeOGN4dVepS-Uw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_cqHquYmlEeO69MVKNB7cFw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_cqHquomlEeO69MVKNB7cFw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqu4mlEeO69MVKNB7cFw"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_61R_kImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_komWEeOGN4dVepS-Uw" x="42" y="597" height="34"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9TcEEImWEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9TcEEomWEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_9S_YIImWEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9TcEEYmWEeOGN4dVepS-Uw" x="309" y="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_D1WR4YmXEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_D1WR44mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_D1WR4ImXEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1WR4omXEeOGN4dVepS-Uw" x="353" y="588"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TnYnQYmXEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TnYnQ4mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_TnYnQImXEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TnYnQomXEeOGN4dVepS-Uw" x="360" y="457"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_anMSAYmXEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_anMSA4mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_anMSAImXEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anMSAomXEeOGN4dVepS-Uw" x="353" y="273" width="148"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Tfr8cYmaEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tfr8c4maEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_Tfr8cImaEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="997" y="72" width="167"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TlMukYmaEeOGN4dVepS-Uw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TlV4gImaEeOGN4dVepS-Uw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_TlMukImaEeOGN4dVepS-Uw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="881" y="248" width="149"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_4EGG0YmVEeOGN4dVepS-Uw"/>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_OgIPAImWEeOGN4dVepS-Uw" name="css_stylesheets" eObjectListValue="_OgIPAYmWEeOGN4dVepS-Uw"/>
+    <styles xmi:type="notation:StringListValueStyle" xmi:id="_PR97oImWEeOGN4dVepS-Uw" name="cssClass"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="__YUK4Ou5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_BTVBEImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_9TcEEImWEeOGN4dVepS-Uw" target="_Cz4qUImWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BTVBEYmXEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTVBEomXEeOGN4dVepS-Uw" points="[-35, 6, 146, -36]$[-97, -8, 84, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTeyEImXEeOGN4dVepS-Uw" id="(0.12323943661971831,0.31666666666666665)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GP624ImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_D1WR4YmXEeOGN4dVepS-Uw" target="_61R_kYmWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_GP624YmXEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GP624omXEeOGN4dVepS-Uw" points="[-88, 4, 270, -13]$[-308, 18, 50, 1]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UCAtwImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_TnYnQYmXEeOGN4dVepS-Uw" target="_Dp5FQImWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UCAtwYmXEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UCAtwomXEeOGN4dVepS-Uw" points="[-16, 1, 271, -20]$[-237, 18, 50, -3]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UCKewImXEeOGN4dVepS-Uw" id="(0.16,0.35)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_bQjYEImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_anMSAYmXEeOGN4dVepS-Uw" target="_az5twYmWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_bQjYEYmXEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bQjYEomXEeOGN4dVepS-Uw" points="[-74, -1, 224, -18]$[-386, -47, -88, -64]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YgJloImaEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_TlMukYmaEeOGN4dVepS-Uw" target="_1epSEYmWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_YgJloYmaEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YgJloomaEeOGN4dVepS-Uw" points="[-74, -6, 126, 1]$[-192, 45, 8, 52]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwLXCEeOtu7CRWiD6kg" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwbXCEeOtu7CRWiD6kg" id="(1.0,0.56)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Y5mAYImaEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_Tfr8cYmaEeOGN4dVepS-Uw" target="_DZrfAYmWEeOGN4dVepS-Uw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Y5mAYYmaEeOGN4dVepS-Uw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5mAYomaEeOGN4dVepS-Uw" points="[-83, -1, 122, -8]$[-198, -48, 7, -55]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJELXCEeOtu7CRWiD6kg" id="(0.0,0.47)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJEbXCEeOtu7CRWiD6kg" id="(1.0,0.5)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_8JDKAImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="labels" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_8JDKAYmVEeOGN4dVepS-Uw"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="__eqqgOu5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>
+  </notation:Diagram>
+  <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="../../stylesheets/compartments.css"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation
index ada4416768d..2be1a525f68 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_cO9GAMQEEeSR9Nn53D1mFA" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_cO-UIMQEEeSR9Nn53D1mFA" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cO-7MMQEEeSR9Nn53D1mFA" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_cO9GAMQEEeSR9Nn53D1mFA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cO-UIMQEEeSR9Nn53D1mFA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cO-7MMQEEeSR9Nn53D1mFA" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_cO-7McQEEeSR9Nn53D1mFA" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_cO-7MsQEEeSR9Nn53D1mFA" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1mssOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_cO-7M8QEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_cO-7NMQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_cO-7NcQEEeSR9Nn53D1mFA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO-7NsQEEeSR9Nn53D1mFA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_cO_iQMQEEeSR9Nn53D1mFA" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1nTwOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_cO_iQcQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_cO_iQsQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_cO_iQ8QEEeSR9Nn53D1mFA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO_iRMQEEeSR9Nn53D1mFA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_cO_iRcQEEeSR9Nn53D1mFA" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1nTweu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_cO_iRsQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_cO_iR8QEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_cO_iSMQEEeSR9Nn53D1mFA"/>
@@ -27,24 +27,24 @@
       <element xmi:type="uml:Class" href="model.uml#_cOP7YMQEEeSR9Nn53D1mFA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO9GAcQEEeSR9Nn53D1mFA" x="33" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_drmqMMQEEeSR9Nn53D1mFA" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_drmqMsQEEeSR9Nn53D1mFA" type="5029"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_drnRQMQEEeSR9Nn53D1mFA" type="8510">
+    <children xmi:type="notation:Shape" xmi:id="_drmqMMQEEeSR9Nn53D1mFA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_drmqMsQEEeSR9Nn53D1mFA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_drnRQMQEEeSR9Nn53D1mFA" type="Class_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_drnRQcQEEeSR9Nn53D1mFA" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_drnRQsQEEeSR9Nn53D1mFA" type="7017">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1n60Ou6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_drnRQ8QEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_drnRRMQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_drnRRcQEEeSR9Nn53D1mFA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drnRRsQEEeSR9Nn53D1mFA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_drnRR8QEEeSR9Nn53D1mFA" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1n60eu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_drnRSMQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_drnRScQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_drnRSsQEEeSR9Nn53D1mFA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drnRS8QEEeSR9Nn53D1mFA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_drn4UMQEEeSR9Nn53D1mFA" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1oh4Ou6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_drn4UcQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_drn4UsQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_drn4U8QEEeSR9Nn53D1mFA"/>
@@ -56,12 +56,12 @@
       <element xmi:type="uml:Class" href="model.uml#_drk1AMQEEeSR9Nn53D1mFA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drmqMcQEEeSR9Nn53D1mFA" x="159" y="58"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hKqLAMQEEeSR9Nn53D1mFA" type="2006">
-      <children xmi:type="notation:DecorationNode" xmi:id="_hKqLAsQEEeSR9Nn53D1mFA" type="5023"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hKqyEMQEEeSR9Nn53D1mFA" type="8508">
+    <children xmi:type="notation:Shape" xmi:id="_hKqLAMQEEeSR9Nn53D1mFA" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hKqLAsQEEeSR9Nn53D1mFA" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hKqyEMQEEeSR9Nn53D1mFA" type="Enumeration_FloatingNameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_hKqyEcQEEeSR9Nn53D1mFA" y="5"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_hKqyEsQEEeSR9Nn53D1mFA" type="7015">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1pI8Ou6EeWb4rS4qgjiLg" type="Enumeration_LiteralCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_hKqyE8QEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_hKqyFMQEEeSR9Nn53D1mFA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_hKqyFcQEEeSR9Nn53D1mFA"/>
@@ -75,6 +75,7 @@
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/>
     <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_B1pwAOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/>
   </notation:Diagram>
   <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/inferredNotationStylesTest.css"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation
index 1ce4b796e3e..542e0a75f1e 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_WBxakCCUEeWbLoxdAKQ_jg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_dtOqYCCUEeWbLoxdAKQ_jg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYiCUEeWbLoxdAKQ_jg" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYyCUEeWbLoxdAKQ_jg" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dtOqZCCUEeWbLoxdAKQ_jg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqZSCUEeWbLoxdAKQ_jg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqZiCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqZyCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqaCCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqaSCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqaiCUEeWbLoxdAKQ_jg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqayCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqbCCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqbSCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqbiCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqbyCUEeWbLoxdAKQ_jg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqcCCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqcSCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqciCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqcyCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_dtIjwCCUEeWbLoxdAKQ_jg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqYSCUEeWbLoxdAKQ_jg" x="233" y="99"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ix1zwSCUEeWbLoxdAKQ_jg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ix1zwyCUEeWbLoxdAKQ_jg" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ix1zxCCUEeWbLoxdAKQ_jg" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ix1zxSCUEeWbLoxdAKQ_jg" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ix1zxiCUEeWbLoxdAKQ_jg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zxyCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zyCCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zySCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zyiCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ix1zyyCUEeWbLoxdAKQ_jg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zzCCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zzSCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zziCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zzyCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ix1z0CCUEeWbLoxdAKQ_jg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1z0SCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1z0iCUEeWbLoxdAKQ_jg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1z0yCUEeWbLoxdAKQ_jg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1z1CCUEeWbLoxdAKQ_jg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_ix1zwCCUEeWbLoxdAKQ_jg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zwiCUEeWbLoxdAKQ_jg" x="674" y="235"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_WBxakSCUEeWbLoxdAKQ_jg" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_WBxakiCUEeWbLoxdAKQ_jg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_WBxakyCUEeWbLoxdAKQ_jg">

-      <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_aev8MCCUEeWbLoxdAKQ_jg" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/>

-    <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_tO62oCCUEeWbLoxdAKQ_jg" type="4001" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QCCUEeWbLoxdAKQ_jg" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QSCUEeWbLoxdAKQ_jg" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QiCUEeWbLoxdAKQ_jg" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QyCUEeWbLoxdAKQ_jg" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RCCUEeWbLoxdAKQ_jg" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RSCUEeWbLoxdAKQ_jg" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RiCUEeWbLoxdAKQ_jg" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RyCUEeWbLoxdAKQ_jg" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SCCUEeWbLoxdAKQ_jg" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SSCUEeWbLoxdAKQ_jg" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SiCUEeWbLoxdAKQ_jg" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SyCUEeWbLoxdAKQ_jg" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_tO62oSCUEeWbLoxdAKQ_jg"/>

-      <element xmi:type="uml:Association" href="model.uml#_tOupYCCUEeWbLoxdAKQ_jg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tO62oiCUEeWbLoxdAKQ_jg" points="[22, 7, -391, -165]$[415, 122, 2, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQCCUEeWbLoxdAKQ_jg" id="(1.0,0.21)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQSCUEeWbLoxdAKQ_jg" id="(0.0,0.09)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_yudogCCUEeWbLoxdAKQ_jg" type="4006" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_yudogyCUEeWbLoxdAKQ_jg" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yudohCCUEeWbLoxdAKQ_jg" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_yujvICCUEeWbLoxdAKQ_jg" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yujvISCUEeWbLoxdAKQ_jg" x="-35" y="28"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_yudogSCUEeWbLoxdAKQ_jg"/>

-      <element xmi:type="uml:Abstraction" href="model.uml#_yuXh4CCUEeWbLoxdAKQ_jg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yudogiCUEeWbLoxdAKQ_jg" points="[38, 13, -357, -125]$[379, 152, -16, 14]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4CCUEeWbLoxdAKQ_jg" id="(1.0,0.91)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4SCUEeWbLoxdAKQ_jg" id="(0.0,0.74)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_ZWq50CCUEeWbLoxdAKQ_jg"/>

-  <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_WBxakCCUEeWbLoxdAKQ_jg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_dtOqYCCUEeWbLoxdAKQ_jg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYiCUEeWbLoxdAKQ_jg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYyCUEeWbLoxdAKQ_jg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dtOqZCCUEeWbLoxdAKQ_jg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC2AUOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqZiCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqZyCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqaCCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqaSCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqayCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqbCCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqbSCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqbiCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqcCCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqcSCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqciCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqcyCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_dtIjwCCUEeWbLoxdAKQ_jg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqYSCUEeWbLoxdAKQ_jg" x="233" y="99"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ix1zwSCUEeWbLoxdAKQ_jg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ix1zwyCUEeWbLoxdAKQ_jg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ix1zxCCUEeWbLoxdAKQ_jg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ix1zxSCUEeWbLoxdAKQ_jg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zxyCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zyCCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zySCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zyiCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC3OcOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zzCCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zzSCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zziCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zzyCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EC3Oceu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ix1z0SCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ix1z0iCUEeWbLoxdAKQ_jg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1z0yCUEeWbLoxdAKQ_jg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1z1CCUEeWbLoxdAKQ_jg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_ix1zwCCUEeWbLoxdAKQ_jg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zwiCUEeWbLoxdAKQ_jg" x="674" y="235"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_WBxakSCUEeWbLoxdAKQ_jg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_WBxakiCUEeWbLoxdAKQ_jg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_WBxakyCUEeWbLoxdAKQ_jg">
+      <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_aev8MCCUEeWbLoxdAKQ_jg" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/>
+    <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_tO62oCCUEeWbLoxdAKQ_jg" type="Association_Edge" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QCCUEeWbLoxdAKQ_jg" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QSCUEeWbLoxdAKQ_jg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QiCUEeWbLoxdAKQ_jg" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QyCUEeWbLoxdAKQ_jg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RCCUEeWbLoxdAKQ_jg" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RSCUEeWbLoxdAKQ_jg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RiCUEeWbLoxdAKQ_jg" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RyCUEeWbLoxdAKQ_jg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SCCUEeWbLoxdAKQ_jg" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SSCUEeWbLoxdAKQ_jg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SiCUEeWbLoxdAKQ_jg" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SyCUEeWbLoxdAKQ_jg" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_tO62oSCUEeWbLoxdAKQ_jg"/>
+      <element xmi:type="uml:Association" href="model.uml#_tOupYCCUEeWbLoxdAKQ_jg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tO62oiCUEeWbLoxdAKQ_jg" points="[22, 7, -391, -165]$[415, 122, 2, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQCCUEeWbLoxdAKQ_jg" id="(1.0,0.21)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQSCUEeWbLoxdAKQ_jg" id="(0.0,0.09)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yudogCCUEeWbLoxdAKQ_jg" type="Abstraction_Edge" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_yudogyCUEeWbLoxdAKQ_jg" type="Abstraction_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yudohCCUEeWbLoxdAKQ_jg" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yujvICCUEeWbLoxdAKQ_jg" type="Abstraction_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yujvISCUEeWbLoxdAKQ_jg" x="-35" y="28"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_yudogSCUEeWbLoxdAKQ_jg"/>
+      <element xmi:type="uml:Abstraction" href="model.uml#_yuXh4CCUEeWbLoxdAKQ_jg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yudogiCUEeWbLoxdAKQ_jg" points="[38, 13, -357, -125]$[379, 152, -16, 14]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4CCUEeWbLoxdAKQ_jg" id="(1.0,0.91)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4SCUEeWbLoxdAKQ_jg" id="(0.0,0.74)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_ZWq50CCUEeWbLoxdAKQ_jg"/>
+  <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation
index ff03f22d99a..98b8537e332 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation
@@ -1,287 +1,288 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0">

-      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">

-        <stringListValue>myInterface</stringListValue>

-      </styles>

-      <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-        <stringListValue>myOtherClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSLjRNt1EeOqjfzVFOrWIg"/>

-      </children>

-      <element xmi:type="uml:Component" href="model.uml#_PSFcoNt1EeOqjfzVFOrWIg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSJHAdt1EeOqjfzVFOrWIg" x="121" y="158"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/>

-    <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw">

-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>

-  </css:ModelStyleSheets>

-  <css:StyleSheetReference xmi:id="_3CgL0Nt3EeOqjfzVFOrWIg" path="../../stylesheets/ModelStylesheetTest.css"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6EOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6Eeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6Euu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMeu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMuu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIM-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">
+        <stringListValue>myInterface</stringListValue>
+      </styles>
+      <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQuu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPcWUOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPcWUeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9YOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Yeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Yuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Y-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkcOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkceu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkcuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+        <stringListValue>myOtherClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLgOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLgeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLguu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLg-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZoOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZoeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZouu6EeWb4rS4qgjiLg" type="Component_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZo-u6EeWb4rS4qgjiLg" type="Component_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FPgAsOu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSLjRNt1EeOqjfzVFOrWIg"/>
+      </children>
+      <element xmi:type="uml:Component" href="model.uml#_PSFcoNt1EeOqjfzVFOrWIg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSJHAdt1EeOqjfzVFOrWIg" x="121" y="158"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_FPgnwOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw">
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>
+  </css:ModelStyleSheets>
+  <css:StyleSheetReference xmi:id="_3CgL0Nt3EeOqjfzVFOrWIg" path="../../stylesheets/ModelStylesheetTest.css"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation
index 0bd30352cd8..b6649ea6c9a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation
@@ -1,194 +1,194 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_bzQ40P76EeSxqMY0na5WMQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_QVnUUP77EeSStPeINaOwzA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYP77EeSStPeINaOwzA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYf77EeSStPeINaOwzA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QV7dYv77EeSStPeINaOwzA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QV7dY_77EeSStPeINaOwzA" type="7017">

-        <children xmi:type="notation:Shape" xmi:id="_hxeHMP77EeSStPeINaOwzA" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_hxLMQP77EeSStPeINaOwzA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_hxeHMf77EeSStPeINaOwzA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_i3vywP77EeSStPeINaOwzA" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_i3mBwP77EeSStPeINaOwzA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_i3vywf77EeSStPeINaOwzA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_jiy64P77EeSStPeINaOwzA" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_jiyT0P77EeSStPeINaOwzA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_jiy64f77EeSStPeINaOwzA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_uff5AP77EeSStPeINaOwzA" type="3012">

-          <element xmi:type="uml:Property" href="model.uml#_ufWvEP77EeSStPeINaOwzA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uff5Af77EeSStPeINaOwzA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dZP77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dZf77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dZv77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dZ_77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QV7daP77EeSStPeINaOwzA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7daf77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dav77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7da_77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dbP77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_QV7dbf77EeSStPeINaOwzA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dbv77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7db_77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dcP77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dcf77EeSStPeINaOwzA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_QTkF4P77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QVnUUf77EeSStPeINaOwzA" x="262" y="70"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lXyGkP77EeSStPeINaOwzA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_lXyGkv77EeSStPeINaOwzA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_lXyGk_77EeSStPeINaOwzA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lXyGlP77EeSStPeINaOwzA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGlf77EeSStPeINaOwzA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGlv77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGl_77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGmP77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGmf77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGmv77EeSStPeINaOwzA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGm_77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGnP77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGnf77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGnv77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGn_77EeSStPeINaOwzA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGoP77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGof77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGov77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGo_77EeSStPeINaOwzA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_lXoVkP77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGkf77EeSStPeINaOwzA" x="711" y="70"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lkV74f77EeSStPeINaOwzA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_lkV74_77EeSStPeINaOwzA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_lkWi8P77EeSStPeINaOwzA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lkWi8f77EeSStPeINaOwzA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi8v77EeSStPeINaOwzA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi8_77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi9P77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi9f77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi9v77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi9_77EeSStPeINaOwzA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi-P77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi-f77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi-v77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi-_77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi_P77EeSStPeINaOwzA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi_f77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi_v77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi__77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWjAP77EeSStPeINaOwzA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_lkV74P77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkV74v77EeSStPeINaOwzA" x="711" y="208"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_xZT-wf77EeSStPeINaOwzA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xZT-w_77EeSStPeINaOwzA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xZT-xP77EeSStPeINaOwzA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xZT-xf77EeSStPeINaOwzA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-xv77EeSStPeINaOwzA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-x_77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-yP77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-yf77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-yv77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-y_77EeSStPeINaOwzA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-zP77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-zf77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-zv77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-z_77EeSStPeINaOwzA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-0P77EeSStPeINaOwzA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-0f77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-0v77EeSStPeINaOwzA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-0_77EeSStPeINaOwzA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-1P77EeSStPeINaOwzA"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_xZT-wP77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-wv77EeSStPeINaOwzA" x="711" y="349"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9x2owP77EeSStPeINaOwzA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_9x2owv77EeSStPeINaOwzA" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_9xte0P77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9x2owf77EeSStPeINaOwzA" x="888" y="236" height="22"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-BeZIP77EeSStPeINaOwzA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-BeZIv77EeSStPeINaOwzA" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_-BdyEP77EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BeZIf77EeSStPeINaOwzA" x="888" y="373" height="22"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_APMN4P78EeSStPeINaOwzA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_APMN4v78EeSStPeINaOwzA" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_APDD8P78EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_APMN4f78EeSStPeINaOwzA" x="888" y="97" height="22"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_FlpVMf78EeSStPeINaOwzA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_FlzGMP78EeSStPeINaOwzA" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_FlpVMP78EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FlpVMv78EeSStPeINaOwzA" x="42" y="102"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_N7EIAf78EeSStPeINaOwzA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_N7EIA_78EeSStPeINaOwzA" type="5038"/>

-      <element xmi:type="uml:Comment" href="model.uml#_N7EIAP78EeSStPeINaOwzA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N7EIAv78EeSStPeINaOwzA" x="60" y="236"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_bzQ40f76EeSxqMY0na5WMQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_bzQ40v76EeSxqMY0na5WMQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bzQ40_76EeSxqMY0na5WMQ">

-      <owner xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_3yJwIP77EeSStPeINaOwzA" name="css_stylesheets" eObjectListValue="_3yK-QP77EeSStPeINaOwzA"/>

-    <element xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_DwbgAP78EeSStPeINaOwzA" type="4013" source="_APMN4P78EeSStPeINaOwzA" target="_lXyGkP77EeSStPeINaOwzA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_DwbgAf78EeSStPeINaOwzA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DwbgAv78EeSStPeINaOwzA" points="[-70, 6, 135, -20]$[-198, -24, 7, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAP78EeSStPeINaOwzA" id="(0.0,0.3333333333333333)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAf78EeSStPeINaOwzA" id="(1.0,0.36)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ELIfAP78EeSStPeINaOwzA" type="4013" source="_9x2owP77EeSStPeINaOwzA" target="_lkV74f77EeSStPeINaOwzA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_ELIfAf78EeSStPeINaOwzA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ELIfAv78EeSStPeINaOwzA" points="[-50, 4, 128, -12]$[-228, 16, -50, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3EP78EeSStPeINaOwzA" id="(0.0,0.6666666666666666)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3Ef78EeSStPeINaOwzA" id="(1.0,0.46)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_EbkHsP78EeSStPeINaOwzA" type="4013" source="_-BeZIP77EeSStPeINaOwzA" target="_xZT-wf77EeSStPeINaOwzA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_EbkHsf78EeSStPeINaOwzA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EbkHsv78EeSStPeINaOwzA" points="[-50, 8, 127, -5]$[-127, 8, 50, -5]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sP78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sf78EeSStPeINaOwzA" id="(1.0,0.42)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_F_rl0P78EeSStPeINaOwzA" type="4013" source="_FlpVMf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_F_rl0f78EeSStPeINaOwzA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F_rl0v78EeSStPeINaOwzA" points="[37, 6, -162, 0]$[150, 0, -49, -6]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38P78EeSStPeINaOwzA" id="(1.0,0.4444444444444444)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38f78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_OSphkP78EeSStPeINaOwzA" type="4013" source="_N7EIAf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_OSphkf78EeSStPeINaOwzA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OSphkv78EeSStPeINaOwzA" points="[0, 0, -133, 53]$[133, 0, 0, 53]$[133, -53, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5oP78EeSStPeINaOwzA" id="(1.0,0.5166666666666667)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5of78EeSStPeINaOwzA" id="(0.16080402010050251,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_1QY-AP77EeSStPeINaOwzA"/>

-  <css:EmbeddedStyleSheet xmi:id="_3yK-QP77EeSStPeINaOwzA" label="" content="Property[type] {&#xD;&#xA;&#x9;bold: true;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;[type=NamedClass]{&#xD;&#xA;&#x9;fontColor: red;&#x9;&#xD;&#xA;}&#xD;&#xA;"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_bzQ40P76EeSxqMY0na5WMQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_QVnUUP77EeSStPeINaOwzA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYP77EeSStPeINaOwzA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYf77EeSStPeINaOwzA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QV7dYv77EeSStPeINaOwzA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HtzPIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_hxeHMP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_hxLMQP77EeSStPeINaOwzA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_hxeHMf77EeSStPeINaOwzA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_i3vywP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_i3mBwP77EeSStPeINaOwzA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_i3vywf77EeSStPeINaOwzA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_jiy64P77EeSStPeINaOwzA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_jiyT0P77EeSStPeINaOwzA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_jiy64f77EeSStPeINaOwzA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_uff5AP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="model.uml#_ufWvEP77EeSStPeINaOwzA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_uff5Af77EeSStPeINaOwzA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dZP77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dZf77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dZv77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dZ_77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Htz2MOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7daf77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dav77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7da_77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dbP77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Htz2Meu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dbv77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QV7db_77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dcP77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dcf77EeSStPeINaOwzA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_QTkF4P77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QVnUUf77EeSStPeINaOwzA" x="262" y="70"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lXyGkP77EeSStPeINaOwzA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lXyGkv77EeSStPeINaOwzA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lXyGk_77EeSStPeINaOwzA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lXyGlP77EeSStPeINaOwzA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht0dQOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGlv77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGl_77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGmP77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGmf77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht0dQeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGm_77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGnP77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGnf77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGnv77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1EUOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGoP77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGof77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGov77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGo_77EeSStPeINaOwzA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_lXoVkP77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGkf77EeSStPeINaOwzA" x="711" y="70"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lkV74f77EeSStPeINaOwzA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lkV74_77EeSStPeINaOwzA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lkWi8P77EeSStPeINaOwzA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lkWi8f77EeSStPeINaOwzA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1EUeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi8_77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi9P77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi9f77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi9v77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi-P77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi-f77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi-v77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi-_77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi_f77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi_v77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi__77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWjAP77EeSStPeINaOwzA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_lkV74P77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkV74v77EeSStPeINaOwzA" x="711" y="208"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xZT-wf77EeSStPeINaOwzA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xZT-w_77EeSStPeINaOwzA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xZT-xP77EeSStPeINaOwzA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xZT-xf77EeSStPeINaOwzA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-x_77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-yP77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-yf77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-yv77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht2ScOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-zP77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-zf77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-zv77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-z_77EeSStPeINaOwzA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ht2Sceu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-0f77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-0v77EeSStPeINaOwzA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-0_77EeSStPeINaOwzA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-1P77EeSStPeINaOwzA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_xZT-wP77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-wv77EeSStPeINaOwzA" x="711" y="349"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9x2owP77EeSStPeINaOwzA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9x2owv77EeSStPeINaOwzA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_9xte0P77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9x2owf77EeSStPeINaOwzA" x="888" y="236" height="22"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-BeZIP77EeSStPeINaOwzA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-BeZIv77EeSStPeINaOwzA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_-BdyEP77EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BeZIf77EeSStPeINaOwzA" x="888" y="373" height="22"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_APMN4P78EeSStPeINaOwzA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_APMN4v78EeSStPeINaOwzA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_APDD8P78EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_APMN4f78EeSStPeINaOwzA" x="888" y="97" height="22"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_FlpVMf78EeSStPeINaOwzA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FlzGMP78EeSStPeINaOwzA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_FlpVMP78EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FlpVMv78EeSStPeINaOwzA" x="42" y="102"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_N7EIAf78EeSStPeINaOwzA" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_N7EIA_78EeSStPeINaOwzA" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="model.uml#_N7EIAP78EeSStPeINaOwzA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N7EIAv78EeSStPeINaOwzA" x="60" y="236"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_bzQ40f76EeSxqMY0na5WMQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_bzQ40v76EeSxqMY0na5WMQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bzQ40_76EeSxqMY0na5WMQ">
+      <owner xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_3yJwIP77EeSStPeINaOwzA" name="css_stylesheets" eObjectListValue="_3yK-QP77EeSStPeINaOwzA"/>
+    <element xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_DwbgAP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_APMN4P78EeSStPeINaOwzA" target="_lXyGkP77EeSStPeINaOwzA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DwbgAf78EeSStPeINaOwzA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DwbgAv78EeSStPeINaOwzA" points="[-70, 6, 135, -20]$[-198, -24, 7, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAP78EeSStPeINaOwzA" id="(0.0,0.3333333333333333)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAf78EeSStPeINaOwzA" id="(1.0,0.36)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ELIfAP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_9x2owP77EeSStPeINaOwzA" target="_lkV74f77EeSStPeINaOwzA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ELIfAf78EeSStPeINaOwzA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ELIfAv78EeSStPeINaOwzA" points="[-50, 4, 128, -12]$[-228, 16, -50, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3EP78EeSStPeINaOwzA" id="(0.0,0.6666666666666666)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3Ef78EeSStPeINaOwzA" id="(1.0,0.46)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_EbkHsP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_-BeZIP77EeSStPeINaOwzA" target="_xZT-wf77EeSStPeINaOwzA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_EbkHsf78EeSStPeINaOwzA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EbkHsv78EeSStPeINaOwzA" points="[-50, 8, 127, -5]$[-127, 8, 50, -5]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sP78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sf78EeSStPeINaOwzA" id="(1.0,0.42)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_F_rl0P78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_FlpVMf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_F_rl0f78EeSStPeINaOwzA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F_rl0v78EeSStPeINaOwzA" points="[37, 6, -162, 0]$[150, 0, -49, -6]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38P78EeSStPeINaOwzA" id="(1.0,0.4444444444444444)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38f78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OSphkP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_N7EIAf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_OSphkf78EeSStPeINaOwzA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OSphkv78EeSStPeINaOwzA" points="[0, 0, -133, 53]$[133, 0, 0, 53]$[133, -53, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5oP78EeSStPeINaOwzA" id="(1.0,0.5166666666666667)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5of78EeSStPeINaOwzA" id="(0.16080402010050251,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_1QY-AP77EeSStPeINaOwzA"/>
+  <css:EmbeddedStyleSheet xmi:id="_3yK-QP77EeSStPeINaOwzA" label="" content="Property[type] {&#xD;&#xA;&#x9;bold: true;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;[type=NamedClass]{&#xD;&#xA;&#x9;fontColor: red;&#x9;&#xD;&#xA;}&#xD;&#xA;"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation
index e2afbef18fd..bb37cbec184 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_w2EO8IeLEeWWuLbIMcUiMw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_xoz6gIeLEeWWuLbIMcUiMw" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xoz6goeLEeWWuLbIMcUiMw" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xoz6g4eLEeWWuLbIMcUiMw" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xoz6hIeLEeWWuLbIMcUiMw" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6hYeLEeWWuLbIMcUiMw" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6hoeLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6h4eLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6iIeLEeWWuLbIMcUiMw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6iYeLEeWWuLbIMcUiMw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6ioeLEeWWuLbIMcUiMw" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6i4eLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6jIeLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6jYeLEeWWuLbIMcUiMw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6joeLEeWWuLbIMcUiMw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6j4eLEeWWuLbIMcUiMw" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6kIeLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6kYeLEeWWuLbIMcUiMw"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6koeLEeWWuLbIMcUiMw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6k4eLEeWWuLbIMcUiMw"/>

-      </children>

-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_16dV4IeLEeWWuLbIMcUiMw" name="shapeVisibility" booleanValue="true"/>

-      <element xmi:type="uml:Class" href="model.uml#_xoqJgIeLEeWWuLbIMcUiMw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6gYeLEeWWuLbIMcUiMw" x="263" y="235"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_w2EO8YeLEeWWuLbIMcUiMw" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_w2EO8oeLEeWWuLbIMcUiMw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_w2EO84eLEeWWuLbIMcUiMw">

-      <owner xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_R4g8MIeMEeWNLI4pV5eoIA" name="css_stylesheets" eObjectListValue="_jv3Q4IePEeWNLI4pV5eoIA"/>

-    <element xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>

-  </notation:Diagram>

-  <css:StyleSheetReference xmi:id="_jv3Q4IePEeWNLI4pV5eoIA" path="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/namedStyleTest.css"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_w2EO8IeLEeWWuLbIMcUiMw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_xoz6gIeLEeWWuLbIMcUiMw" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xoz6goeLEeWWuLbIMcUiMw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xoz6g4eLEeWWuLbIMcUiMw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xoz6hIeLEeWWuLbIMcUiMw" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JiqfAOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6hoeLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6h4eLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6iIeLEeWWuLbIMcUiMw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6iYeLEeWWuLbIMcUiMw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JirGEOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6i4eLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6jIeLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6jYeLEeWWuLbIMcUiMw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6joeLEeWWuLbIMcUiMw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JirGEeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6kIeLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6kYeLEeWWuLbIMcUiMw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6koeLEeWWuLbIMcUiMw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6k4eLEeWWuLbIMcUiMw"/>
+      </children>
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_16dV4IeLEeWWuLbIMcUiMw" name="shapeVisibility" booleanValue="true"/>
+      <element xmi:type="uml:Class" href="model.uml#_xoqJgIeLEeWWuLbIMcUiMw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6gYeLEeWWuLbIMcUiMw" x="263" y="235"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_w2EO8YeLEeWWuLbIMcUiMw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_w2EO8oeLEeWWuLbIMcUiMw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_w2EO84eLEeWWuLbIMcUiMw">
+      <owner xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_R4g8MIeMEeWNLI4pV5eoIA" name="css_stylesheets" eObjectListValue="_jv3Q4IePEeWNLI4pV5eoIA"/>
+    <element xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>
+  </notation:Diagram>
+  <css:StyleSheetReference xmi:id="_jv3Q4IePEeWNLI4pV5eoIA" path="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/namedStyleTest.css"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation
index 933eb6ad99b..b61a622ae19 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8Ou6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8eu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8uu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
@@ -24,21 +24,21 @@
       <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
@@ -47,21 +47,21 @@
       <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEeu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEuu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
@@ -70,21 +70,21 @@
       <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQE-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3IOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3Ieu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
@@ -96,21 +96,21 @@
       <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3Iuu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjseMOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjseMeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
@@ -119,30 +119,30 @@
       <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">
+    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
       </children>
       <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
@@ -151,21 +151,21 @@
       <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
@@ -178,21 +178,21 @@
       <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6cOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
@@ -201,21 +201,21 @@
       <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6ceu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6cuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjvhgOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
@@ -227,21 +227,21 @@
       <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhgeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhguu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhg-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
@@ -253,21 +253,21 @@
       <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjwIkOu6EeWb4rS4qgjiLg" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KjwvoOu6EeWb4rS4qgjiLg" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Kjwvoeu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/>
@@ -278,6 +278,7 @@
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
     <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_KjxWsOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw">
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation
index da68a47987d..f3df2aa8dfa 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation
@@ -1,261 +1,262 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">

-        <stringListValue>myInterface</stringListValue>

-      </styles>

-      <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>

-      </children>

-      <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-        <stringListValue>myOtherClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>

-      </children>

-      <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>

-      </children>

-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">

-        <stringListValue>myClass</stringListValue>

-      </styles>

-      <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_wKMU0X_vEeGjwt6V_QPj1Q"/>

-    <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>

-  </notation:Diagram>

-  <css:StyleSheetReference xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8YOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Yeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Yuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Y-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8ZOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwyjcOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjceu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjcuu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjc-u6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwyjdOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKgOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKgeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">
+        <stringListValue>myInterface</stringListValue>
+      </styles>
+      <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKguu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKg-u6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKhOu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>
+      </children>
+      <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LwzxkOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxkeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxkuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxk-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0YoOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0Yoeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0Youu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+        <stringListValue>myOtherClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_sOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_seu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_suu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_s-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mwOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mweu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mwuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mw-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mxOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>
+      </children>
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">
+        <stringListValue>myClass</stringListValue>
+      </styles>
+      <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_wKMU0X_vEeGjwt6V_QPj1Q"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_Lw2N0Ou6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+    <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
+  </notation:Diagram>
+  <css:StyleSheetReference xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation
index 0d35682ea11..d7070750faf 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6iZwOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0Ou6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0eu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
@@ -24,21 +24,21 @@
       <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0uu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA1Ou6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
@@ -47,21 +47,21 @@
       <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4Ou6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4eu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4uu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
@@ -70,21 +70,21 @@
       <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn5Ou6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8Ou6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
@@ -96,21 +96,21 @@
       <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">
-      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">
+    <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8eu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8uu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8-u6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
@@ -119,30 +119,30 @@
       <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">
+    <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO9Ou6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
       </children>
       <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO9eu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2AOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2Aeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
@@ -151,21 +151,21 @@
       <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2Auu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2A-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2BOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
@@ -178,21 +178,21 @@
       <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
@@ -201,21 +201,21 @@
       <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldE-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldFOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldFeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
@@ -227,21 +227,21 @@
       <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
@@ -253,21 +253,21 @@
       <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEI-u6EeWb4rS4qgjiLg" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEJOu6EeWb4rS4qgjiLg" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6mrMOu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/>
@@ -278,6 +278,7 @@
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
     <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_M6mrMeu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw">
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java
index 43c3c436003..f74f81ab5c1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java
@@ -1,254 +1,261 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

-import java.io.IOException;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

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

-import org.eclipse.emf.ecore.EObject;

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

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

-import org.eclipse.gmf.runtime.notation.BasicCompartment;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.gmf.runtime.notation.StringListValueStyle;

-import org.eclipse.gmf.runtime.notation.TitleStyle;

-import org.eclipse.gmf.runtime.notation.View;

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

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;

-import org.eclipse.papyrus.junit.framework.classification.NotImplemented;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-/**

- * Test case for Compartment-related styles and properties

- * See resources/model/compartmentsTest/model.di for details

- *

- * @author Camille Letavernier

- *

- */

-public class CSSCompartmentsTests extends AbstractPapyrusTest {

-

-	public static final String CLASS_ATTRIBUTE_COMPARTMENT_TYPE = "7017"; //$NON-NLS-1$

-

-	public static final String CLASS_OPERATION_COMPARTMENT_TYPE = "7018"; //$NON-NLS-1$

-

-	public static final String CLASS_CLASSIFIER_COMPARTMENT_TYPE = "7019"; //$NON-NLS-1$

-

-	public static final String INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE = "7006"; //$NON-NLS-1$

-

-	public static final String INTERFACE_OPERATION_COMPARTMENT_TYPE = "7007"; //$NON-NLS-1$

-

-	public static final String INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE = "7008"; //$NON-NLS-1$

-

-	public static final String ENUMERATION_LITERAL_COMPARTMENT_TYPE = "7015"; //$NON-NLS-1$

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	private CSSDiagram diagram;

-

-	@Before

-	public void init() {

-		ResourceSet resourceSet = houseKeeper.createResourceSet();

-		CSSHelper.installCSSSupport(resourceSet);

-

-		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/compartmentsTest/model.notation", true); //$NON-NLS-1$

-		try {

-			Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);

-			Assert.assertNotNull("Cannot find the model", diagram);

-			Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);

-			this.diagram = (CSSDiagram)diagram;

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/* Test Class1 and Class2 */

-	@Test

-	public void testAttributeCompartment() {

-		Shape class1 = findShape("Class1");

-		Shape class2 = findShape("Class2");

-

-		BasicCompartment attributes1 = findCompartment(class1, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);

-		Assert.assertTrue("Attribute compartment should be collapsed, as it contains a P1 property", attributes1.isCollapsed());

-		Assert.assertTrue("Attribute compartment should be visible", attributes1.isVisible());

-		BasicCompartment operations1 = findCompartment(class1, CLASS_OPERATION_COMPARTMENT_TYPE);

-		Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());

-		BasicCompartment classifiers1 = findCompartment(class1, CLASS_CLASSIFIER_COMPARTMENT_TYPE);

-		Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());

-

-		BasicCompartment attributes2 = findCompartment(class2, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);

-		Assert.assertFalse("Attribute compartment should not be collapsed, as it doesn't contain a P1 property", attributes2.isCollapsed());

-		Assert.assertTrue("Attribute compartment should be visible", attributes2.isVisible());

-		BasicCompartment operations2 = findCompartment(class2, CLASS_OPERATION_COMPARTMENT_TYPE);

-		Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());

-		BasicCompartment classifiers2 = findCompartment(class2, CLASS_CLASSIFIER_COMPARTMENT_TYPE);

-		Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());

-

-

-	}

-

-	/* Test Enumeration1 */

-	@NotImplemented("The 'case insensitive' attributes are not supported by Eclipse E4 CSS")

-	@Test

-	public void testCaseInsensitiveForEnumeration() {

-		Shape enumeration = findShape("Enumeration1");

-		BasicCompartment compartment = findCompartment(enumeration, ENUMERATION_LITERAL_COMPARTMENT_TYPE);

-

-		Assert.assertFalse("EnumerationLiteral Compartment should not be collapsed", compartment.isCollapsed());

-	}

-

-	/* Test Interface 1 and Interface 2 */

-	@Test

-	public void testAttributeCompartmentForInterface() {

-		Shape interface1 = findShape("Interface1");

-		Shape interface2 = findShape("Interface2");

-

-		BasicCompartment attributes1 = findCompartment(interface1, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);

-		Assert.assertTrue("Attribute compartment should be visible, as it contains a Property", attributes1.isVisible());

-		BasicCompartment operations1 = findCompartment(interface1, INTERFACE_OPERATION_COMPARTMENT_TYPE);

-		Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());

-		BasicCompartment classifiers1 = findCompartment(interface1, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);

-		Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());

-

-		BasicCompartment attributes2 = findCompartment(interface2, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);

-		Assert.assertFalse("Attribute compartment should not be visible, as it doesn't contain any property", attributes2.isVisible());

-		BasicCompartment operations2 = findCompartment(interface2, INTERFACE_OPERATION_COMPARTMENT_TYPE);

-		Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());

-		BasicCompartment classifiers2 = findCompartment(interface2, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);

-		Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());

-	}

-

-	/* Test Class 3 */

-	@Test

-	public void testCompartmentForceValue() {

-		//Test initial situation

-		Shape class3 = findShape("Class3");

-

-		//Check all compartments

-		for(View childNode : (List<View>)class3.getChildren()) {

-			if(childNode instanceof BasicCompartment) {

-				Assert.assertFalse("All compartments from Class3 should be hidden. " + childNode.getType() + " is visible", childNode.isVisible());

-			}

-		}

-

-		//We need an editingDomain for the ResetStyle operation

-		createAndAttachEditingDomain(diagram);

-

-		//Test resetStyle

-		ResetStyleHelper.resetStyle(Collections.singleton(class3));

-

-		//Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined.

-		BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);

-		BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE);

-

-		Assert.assertTrue("Attributes compartment should be visible after the reset style", attributesCompartment.isVisible());

-		Assert.assertTrue("Operations compartment should be visible after the reset style", operationsCompartment.isVisible());

-	}

-

-	/* Test apply style */

-	@Test

-	//Currently fails. showTitle is not properly supported for BasicCompartments

-	//Unlike Compartment, BasicCompartment doesn't implement TitleStyle. Instead,

-	//it owns a specific instance of TitleStyle, which is not supported by the CSS Engine (?)

-	public void testShowAllCompartmentsTitles() {

-		//Initial state: title should be hidden

-		for(View childNode : (List<View>)diagram.getChildren()) {

-			for(View compartment : (List<View>)childNode.getChildren()) {

-				if(compartment instanceof BasicCompartment) {

-					TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());

-					Assert.assertFalse("Title should be hidden for " + childNode + ", " + compartment, titleStyle.isShowTitle());

-				}

-			}

-		}

-

-		//Apply style

-		StringListValueStyle stylesList = (StringListValueStyle)diagram.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), "cssClass");

-		if(stylesList == null) {

-			stylesList = NotationFactory.eINSTANCE.createStringListValueStyle();

-		}

-		stylesList.getStringListValue().add("showTitleForAllCompartments");

-

-		//Check that all titles are visible

-		for(View childNode : (List<View>)diagram.getChildren()) {

-			for(View compartment : (List<View>)childNode.getChildren()) {

-				if(compartment instanceof BasicCompartment) {

-					TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());

-					Assert.assertTrue("Title should be visible", titleStyle.isShowTitle());

-				}

-			}

-		}

-

-	}

-

-	protected static TransactionalEditingDomain createAndAttachEditingDomain(EObject element) {

-		TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), element.eResource().getResourceSet());

-		element.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));

-		return domain;

-	}

-

-	@After

-	public void dispose() {

-		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();

-		while(iterator.hasNext()) {

-			iterator.next().unload();

-			iterator.remove();

-		}

-	}

-

-	private BasicCompartment findCompartment(Shape element, String type) {

-		for(View childNode : (List<View>)element.getChildren()) {

-			if(type.equals(childNode.getType())) {

-				return (BasicCompartment)childNode;

-			}

-		}

-

-		return null;

-	}

-

-	private Shape findShape(String elementName) {

-		for(Object viewObject : diagram.getChildren()) {

-			View view = (View)viewObject;

-			if(view instanceof Shape && view.getElement() instanceof NamedElement) {

-				NamedElement element = (NamedElement)view.getElement();

-				if(elementName.equals(element.getName())) {

-					return (Shape)view;

-				}

-			}

-		}

-

-		Assert.fail("Cannot find the view associated to " + elementName);

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
+import org.eclipse.papyrus.junit.framework.classification.NotImplemented;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart;
+import org.eclipse.uml2.uml.NamedElement;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for Compartment-related styles and properties
+ * See resources/model/compartmentsTest/model.di for details
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CSSCompartmentsTests extends AbstractPapyrusTest {
+
+	public static final String CLASS_ATTRIBUTE_COMPARTMENT_TYPE = ClassAttributeCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String CLASS_OPERATION_COMPARTMENT_TYPE = ClassOperationCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String CLASS_CLASSIFIER_COMPARTMENT_TYPE = ClassNestedClassifierCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE = InterfaceAttributeCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String INTERFACE_OPERATION_COMPARTMENT_TYPE = InterfaceOperationCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE = InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	public static final String ENUMERATION_LITERAL_COMPARTMENT_TYPE = EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	private CSSDiagram diagram;
+
+	@Before
+	public void init() {
+		ResourceSet resourceSet = houseKeeper.createResourceSet();
+		CSSHelper.installCSSSupport(resourceSet);
+
+		URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/compartmentsTest/model.notation", true); //$NON-NLS-1$
+		try {
+			Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);
+			Assert.assertNotNull("Cannot find the model", diagram);
+			Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
+			this.diagram = (CSSDiagram)diagram;
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/* Test Class1 and Class2 */
+	@Test
+	public void testAttributeCompartment() {
+		Shape class1 = findShape("Class1");
+		Shape class2 = findShape("Class2");
+
+		BasicCompartment attributes1 = findCompartment(class1, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
+		Assert.assertTrue("Attribute compartment should be collapsed, as it contains a P1 property", attributes1.isCollapsed());
+		Assert.assertTrue("Attribute compartment should be visible", attributes1.isVisible());
+		BasicCompartment operations1 = findCompartment(class1, CLASS_OPERATION_COMPARTMENT_TYPE);
+		Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());
+		BasicCompartment classifiers1 = findCompartment(class1, CLASS_CLASSIFIER_COMPARTMENT_TYPE);
+		Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());
+
+		BasicCompartment attributes2 = findCompartment(class2, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
+		Assert.assertFalse("Attribute compartment should not be collapsed, as it doesn't contain a P1 property", attributes2.isCollapsed());
+		Assert.assertTrue("Attribute compartment should be visible", attributes2.isVisible());
+		BasicCompartment operations2 = findCompartment(class2, CLASS_OPERATION_COMPARTMENT_TYPE);
+		Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());
+		BasicCompartment classifiers2 = findCompartment(class2, CLASS_CLASSIFIER_COMPARTMENT_TYPE);
+		Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());
+
+
+	}
+
+	/* Test Enumeration1 */
+	@NotImplemented("The 'case insensitive' attributes are not supported by Eclipse E4 CSS")
+	@Test
+	public void testCaseInsensitiveForEnumeration() {
+		Shape enumeration = findShape("Enumeration1");
+		BasicCompartment compartment = findCompartment(enumeration, ENUMERATION_LITERAL_COMPARTMENT_TYPE);
+
+		Assert.assertFalse("EnumerationLiteral Compartment should not be collapsed", compartment.isCollapsed());
+	}
+
+	/* Test Interface 1 and Interface 2 */
+	@Test
+	public void testAttributeCompartmentForInterface() {
+		Shape interface1 = findShape("Interface1");
+		Shape interface2 = findShape("Interface2");
+
+		BasicCompartment attributes1 = findCompartment(interface1, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);
+		Assert.assertTrue("Attribute compartment should be visible, as it contains a Property", attributes1.isVisible());
+		BasicCompartment operations1 = findCompartment(interface1, INTERFACE_OPERATION_COMPARTMENT_TYPE);
+		Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());
+		BasicCompartment classifiers1 = findCompartment(interface1, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);
+		Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());
+
+		BasicCompartment attributes2 = findCompartment(interface2, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);
+		Assert.assertFalse("Attribute compartment should not be visible, as it doesn't contain any property", attributes2.isVisible());
+		BasicCompartment operations2 = findCompartment(interface2, INTERFACE_OPERATION_COMPARTMENT_TYPE);
+		Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());
+		BasicCompartment classifiers2 = findCompartment(interface2, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);
+		Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());
+	}
+
+	/* Test Class 3 */
+	@Test
+	public void testCompartmentForceValue() {
+		//Test initial situation
+		Shape class3 = findShape("Class3");
+
+		//Check all compartments
+		for(View childNode : (List<View>)class3.getChildren()) {
+			if(childNode instanceof BasicCompartment) {
+				Assert.assertFalse("All compartments from Class3 should be hidden. " + childNode.getType() + " is visible", childNode.isVisible());
+			}
+		}
+
+		//We need an editingDomain for the ResetStyle operation
+		createAndAttachEditingDomain(diagram);
+
+		//Test resetStyle
+		ResetStyleHelper.resetStyle(Collections.singleton(class3));
+
+		//Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined.
+		BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
+		BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE);
+
+		Assert.assertTrue("Attributes compartment should be visible after the reset style", attributesCompartment.isVisible());
+		Assert.assertTrue("Operations compartment should be visible after the reset style", operationsCompartment.isVisible());
+	}
+
+	/* Test apply style */
+	@Test
+	//Currently fails. showTitle is not properly supported for BasicCompartments
+	//Unlike Compartment, BasicCompartment doesn't implement TitleStyle. Instead,
+	//it owns a specific instance of TitleStyle, which is not supported by the CSS Engine (?)
+	public void testShowAllCompartmentsTitles() {
+		//Initial state: title should be hidden
+		for(View childNode : (List<View>)diagram.getChildren()) {
+			for(View compartment : (List<View>)childNode.getChildren()) {
+				if(compartment instanceof BasicCompartment) {
+					TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+					Assert.assertFalse("Title should be hidden for " + childNode + ", " + compartment, titleStyle.isShowTitle());
+				}
+			}
+		}
+
+		//Apply style
+		StringListValueStyle stylesList = (StringListValueStyle)diagram.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), "cssClass");
+		if(stylesList == null) {
+			stylesList = NotationFactory.eINSTANCE.createStringListValueStyle();
+		}
+		stylesList.getStringListValue().add("showTitleForAllCompartments");
+
+		//Check that all titles are visible
+		for(View childNode : (List<View>)diagram.getChildren()) {
+			for(View compartment : (List<View>)childNode.getChildren()) {
+				if(compartment instanceof BasicCompartment) {
+					TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+					Assert.assertTrue("Title should be visible", titleStyle.isShowTitle());
+				}
+			}
+		}
+
+	}
+
+	protected static TransactionalEditingDomain createAndAttachEditingDomain(EObject element) {
+		TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), element.eResource().getResourceSet());
+		element.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
+		return domain;
+	}
+
+	@After
+	public void dispose() {
+		Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();
+		while(iterator.hasNext()) {
+			iterator.next().unload();
+			iterator.remove();
+		}
+	}
+
+	private BasicCompartment findCompartment(Shape element, String type) {
+		for(View childNode : (List<View>)element.getChildren()) {
+			if(type.equals(childNode.getType())) {
+				return (BasicCompartment)childNode;
+			}
+		}
+
+		return null;
+	}
+
+	private Shape findShape(String elementName) {
+		for(Object viewObject : diagram.getChildren()) {
+			View view = (View)viewObject;
+			if(view instanceof Shape && view.getElement() instanceof NamedElement) {
+				NamedElement element = (NamedElement)view.getElement();
+				if(elementName.equals(element.getName())) {
+					return (Shape)view;
+				}
+			}
+		}
+
+		Assert.fail("Cannot find the view associated to " + elementName);
+		return null;
+	}
+
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java
index 5f6a73ef812..b68cb5407d4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java
@@ -1,299 +1,301 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * 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:

- *   CEA LIST - Initial API and implementation

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;

-

-import java.util.Iterator;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.NotEnabledException;

-import org.eclipse.core.commands.NotHandledException;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.FigureUtils;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.DiagramUtils;

-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;

-import org.eclipse.papyrus.junit.utils.rules.PluginResource;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-import org.junit.Test;

-

-

-/**

- * The Class CSSKindSelectorTest defined to test CSS selector kind for Compartment, FloatingLabel and one specific external label.

- */

-@PluginResource("/resources/model/kindSelectorTest/model.di")

-public class CSSKindSelectorTest extends AbstractPapyrusTest {

-

-	/** The diagram. */

-	private Diagram diagram = null;

-

-

-	/** The model set fixture. */

-	@Rule

-	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();

-

-

-	@Before

-	public void init() {

-		diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "ClassDiagram");

-	}

-

-

-	/**

-	 * Test kind selector for compartment with:

-	 * Compartment[kind=attributes]{visible:false;}

-	 *

-	 * @throws ExecutionException

-	 *             the execution exception

-	 * @throws NotDefinedException

-	 *             the not defined exception

-	 * @throws NotEnabledException

-	 *             the not enabled exception

-	 * @throws NotHandledException

-	 *             the not handled exception

-	 */

-	@Test

-	public void testKindSelectorForCompartment() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {

-		EditPart classEditPart = getEditPart("Class1");

-		Assert.assertTrue(classEditPart instanceof GraphicalEditPart);

-		Iterator<ResizableCompartmentFigure> compartments = FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class).iterator();

-

-		boolean visible = false;

-

-		while (false == visible && compartments.hasNext()) {

-			ResizableCompartmentFigure compartment = (ResizableCompartmentFigure) compartments.next();

-			if ("attributes".equals(compartment.getCompartmentTitle())) {

-				visible = true;

-			}

-		}

-

-		Assert.assertTrue("attributes must be visible by default", visible);

-

-		setEmbeddedStyleSheet("Compartment[kind=attributes]", "visible", String.valueOf(false), false);

-		classEditPart.refresh();

-

-		for (ResizableCompartmentFigure compartment : FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class)) {

-			Assert.assertFalse("Attributes Compartment must not be visible with Compartment[kind=attributes]{visible:false;}", "attributes".equals(compartment.getCompartmentTitle()));

-		}

-	}

-

-	/**

-	 * Test kind selector for label with:

-	 * 

-	 * Label[kind=FloatingLabel]{visible:true;}

-	 * Label[kind=TargetRole]{visible:false;}

-	 * 

-	 * @throws NotHandledException

-	 * @throws NotEnabledException

-	 * @throws NotDefinedException

-	 * @throws ExecutionException

-	 */

-	@Test

-	public void testKindSelectorForLabel() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {

-		EditPart classEditPart = getEditPart("Class1");

-		Assert.assertTrue(classEditPart instanceof GraphicalEditPart);

-

-		String classFloatingNameVisualID = "8510";

-		IFigure floatingLabelFigure = findChildFigurebyVisualID(classEditPart, classFloatingNameVisualID);

-

-		// Test the default visibility of floatingLabel

-		Assert.assertNotNull("Flaoting label must exist", floatingLabelFigure);

-		Assert.assertFalse("Floating label must be hidden by default", floatingLabelFigure.isVisible());

-

-		// Set the visibility to true with CSS selector

-		setEmbeddedStyleSheet("Label[kind=FloatingLabel]", "visible", String.valueOf(true), false);

-		classEditPart.refresh();

-

-		// Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]

-		Assert.assertTrue("FloatingLabel must be visible with CSS selector Label[kind=FloatingLabel]", floatingLabelFigure.isVisible());

-

-

-		// test the association Target Name

-		EditPart associationEditPart = getEditPart("associationName");

-		Assert.assertTrue(associationEditPart instanceof ConnectionEditPart);

-

-		String associationTargetNameVisualID = "6003";

-		IFigure associationTargetNameFigure = findChildFigurebyVisualID(associationEditPart, associationTargetNameVisualID);

-

-		// Test the default visibility of associationTargetName

-		Assert.assertNotNull("TargetRole Label must exist", associationTargetNameFigure);

-		Assert.assertTrue("TargetRole Label must be visible by default", associationTargetNameFigure.isVisible());

-

-		// Set the visibility to true with CSS selector

-		setEmbeddedStyleSheet("Label[kind=TargetRole]", "visible", String.valueOf(false), false);

-		associationEditPart.refresh();

-

-		// Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]

-		Assert.assertFalse("TargetRole Label must be hidden with CSS selector Label[kind=TargetRole]", associationTargetNameFigure.isVisible());

-

-	}

-

-

-	/**

-	 * Find child figure by visual id.

-	 *

-	 * @param classEditPart

-	 *            the class edit part

-	 * @param classFloatingNameVisualID

-	 *            the class floating name visual id

-	 * @return the figure

-	 */

-	private IFigure findChildFigurebyVisualID(EditPart classEditPart, String classFloatingNameVisualID) {

-		// Find the floatingLabelFigure

-		IFigure floatingLabelFigure = null;

-		Iterator<?> childsIterator = classEditPart.getChildren().iterator();

-		while (null == floatingLabelFigure && childsIterator.hasNext()) {

-			Object child = childsIterator.next();

-

-			if (child instanceof IGraphicalEditPart && classFloatingNameVisualID.equals(((IGraphicalEditPart) child).getNotationView().getType())) {

-				floatingLabelFigure = (IFigure) ((IGraphicalEditPart) child).getFigure();

-			}

-		}

-		return floatingLabelFigure;

-	}

-

-

-	/**

-	 * Sets the embedded style sheet. Element + "{" + attribut + ":" + value + ";}"

-	 *

-	 * @param Element

-	 *            the element

-	 * @param attribut

-	 *            the attribut

-	 * @param value

-	 *            the value

-	 * @param append

-	 *            the append

-	 * @throws ExecutionException

-	 *             the execution exception

-	 * @throws NotDefinedException

-	 *             the not defined exception

-	 * @throws NotEnabledException

-	 *             the not enabled exception

-	 * @throws NotHandledException

-	 *             the not handled exception

-	 */

-	private void setEmbeddedStyleSheet(final String Element, final String attribut, final String value, final boolean append) throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {

-		final EmbeddedStyleSheet embeddedStyleSheet = getEmbeddedStyleSheet(diagram);

-		Assert.assertNotNull(embeddedStyleSheet);

-

-		Command command = new RecordingCommand(modelSetFixture.getEditingDomain()) {

-

-			@Override

-			protected void doExecute() {

-				String str = append ? embeddedStyleSheet.getContent() + "\n" : "";

-				embeddedStyleSheet.setContent(str + Element + "{" + attribut + ":" + value + ";}");

-			}

-		};

-		getCommandStack().execute(command);

-		refreshEditor();

-

-	}

-

-	/**

-	 * Gets the embedded style sheet.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the embedded style sheet

-	 */

-	private EmbeddedStyleSheet getEmbeddedStyleSheet(Diagram diagram) {

-		Iterator<EObject> iterator = diagram.eResource().getContents().iterator();

-		EmbeddedStyleSheet embeddedStyleSheet = null;

-		while (null == embeddedStyleSheet && iterator.hasNext()) {

-			Object object = iterator.next();

-			if (object instanceof EmbeddedStyleSheet) {

-				embeddedStyleSheet = (EmbeddedStyleSheet) object;

-			}

-		}

-		Assert.assertNotNull(embeddedStyleSheet);

-		return embeddedStyleSheet;

-	}

-

-	/**

-	 * Gets the command stack.

-	 *

-	 * @return the command stack

-	 */

-	private CommandStack getCommandStack() {

-		return modelSetFixture.getEditingDomain().getCommandStack();

-	}

-

-	/**

-	 * Refresh editor.

-	 */

-	private void refreshEditor() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {

-		String REFRESH_COMMAND_ID = "org.eclipse.ui.file.refresh"; //$NON-NLS-1$

-		ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);

-		org.eclipse.core.commands.Command refreshCommand = commandService.getCommand(REFRESH_COMMAND_ID);

-		if (refreshCommand.getHandler().isEnabled()) {

-			refreshCommand.executeWithChecks(new ExecutionEvent());

-		}

-	}

-

-	/**

-	 * Gets the edits the part.

-	 *

-	 * @param semanticElement

-	 *            the semantic element

-	 * @return the edits the part

-	 */

-	private EditPart getEditPart(String semanticElement) {

-

-		modelSetFixture.getPageManager().openPage(diagram);

-

-		View diagramView = DiagramUtils.findShape(diagram, semanticElement);

-		if (diagramView == null) {

-			diagramView = DiagramUtils.findEdge(diagram, semanticElement);

-		}

-		if (diagramView == null) {

-			Iterator<?> iterator = diagram.eAllContents();

-			while (null == diagramView && iterator.hasNext()) {

-				Object object = iterator.next();

-				if (object instanceof View) {

-					diagramView = DiagramUtils.findShape((View) object, semanticElement);

-					if (diagramView == null) {

-						diagramView = DiagramUtils.findEdge((View) object, semanticElement);

-					}

-				}

-			}

-		}

-

-		Assert.assertNotNull(diagramView);

-

-		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);

-		Assert.assertNotNull(semanticEP);

-

-		return semanticEP;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.FigureUtils;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.DiagramUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+
+/**
+ * The Class CSSKindSelectorTest defined to test CSS selector kind for Compartment, FloatingLabel and one specific external label.
+ */
+@PluginResource("/resources/model/kindSelectorTest/model.di")
+public class CSSKindSelectorTest extends AbstractPapyrusTest {
+
+	/** The diagram. */
+	private Diagram diagram = null;
+
+
+	/** The model set fixture. */
+	@Rule
+	public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();
+
+
+	@Before
+	public void init() {
+		diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "ClassDiagram");
+	}
+
+
+	/**
+	 * Test kind selector for compartment with:
+	 * Compartment[kind=attributes]{visible:false;}
+	 *
+	 * @throws ExecutionException
+	 *             the execution exception
+	 * @throws NotDefinedException
+	 *             the not defined exception
+	 * @throws NotEnabledException
+	 *             the not enabled exception
+	 * @throws NotHandledException
+	 *             the not handled exception
+	 */
+	@Test
+	public void testKindSelectorForCompartment() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
+		EditPart classEditPart = getEditPart("Class1");
+		Assert.assertTrue(classEditPart instanceof GraphicalEditPart);
+		Iterator<ResizableCompartmentFigure> compartments = FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class).iterator();
+
+		boolean visible = false;
+
+		while (false == visible && compartments.hasNext()) {
+			ResizableCompartmentFigure compartment = (ResizableCompartmentFigure) compartments.next();
+			if ("attributes".equals(compartment.getCompartmentTitle())) {
+				visible = true;
+			}
+		}
+
+		Assert.assertTrue("attributes must be visible by default", visible);
+
+		setEmbeddedStyleSheet("Compartment[kind=attributes]", "visible", String.valueOf(false), false);
+		classEditPart.refresh();
+
+		for (ResizableCompartmentFigure compartment : FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class)) {
+			Assert.assertFalse("Attributes Compartment must not be visible with Compartment[kind=attributes]{visible:false;}", "attributes".equals(compartment.getCompartmentTitle()));
+		}
+	}
+
+	/**
+	 * Test kind selector for label with:
+	 * 
+	 * Label[kind=FloatingLabel]{visible:true;}
+	 * Label[kind=TargetRole]{visible:false;}
+	 * 
+	 * @throws NotHandledException
+	 * @throws NotEnabledException
+	 * @throws NotDefinedException
+	 * @throws ExecutionException
+	 */
+	@Test
+	public void testKindSelectorForLabel() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
+		EditPart classEditPart = getEditPart("Class1");
+		Assert.assertTrue(classEditPart instanceof GraphicalEditPart);
+
+		String classFloatingNameVisualID = ClassFloatingNameEditPart.VISUAL_ID;
+		IFigure floatingLabelFigure = findChildFigurebyVisualID(classEditPart, classFloatingNameVisualID);
+
+		// Test the default visibility of floatingLabel
+		Assert.assertNotNull("Flaoting label must exist", floatingLabelFigure);
+		Assert.assertFalse("Floating label must be hidden by default", floatingLabelFigure.isVisible());
+
+		// Set the visibility to true with CSS selector
+		setEmbeddedStyleSheet("Label[kind=FloatingLabel]", "visible", String.valueOf(true), false);
+		classEditPart.refresh();
+
+		// Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]
+		Assert.assertTrue("FloatingLabel must be visible with CSS selector Label[kind=FloatingLabel]", floatingLabelFigure.isVisible());
+
+
+		// test the association Target Name
+		EditPart associationEditPart = getEditPart("associationName");
+		Assert.assertTrue(associationEditPart instanceof ConnectionEditPart);
+
+		String associationTargetNameVisualID = AssociationTargetNameEditPart.VISUAL_ID;
+		IFigure associationTargetNameFigure = findChildFigurebyVisualID(associationEditPart, associationTargetNameVisualID);
+
+		// Test the default visibility of associationTargetName
+		Assert.assertNotNull("TargetRole Label must exist", associationTargetNameFigure);
+		Assert.assertTrue("TargetRole Label must be visible by default", associationTargetNameFigure.isVisible());
+
+		// Set the visibility to true with CSS selector
+		setEmbeddedStyleSheet("Label[kind=TargetRole]", "visible", String.valueOf(false), false);
+		associationEditPart.refresh();
+
+		// Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]
+		Assert.assertFalse("TargetRole Label must be hidden with CSS selector Label[kind=TargetRole]", associationTargetNameFigure.isVisible());
+
+	}
+
+
+	/**
+	 * Find child figure by visual id.
+	 *
+	 * @param classEditPart
+	 *            the class edit part
+	 * @param classFloatingNameVisualID
+	 *            the class floating name visual id
+	 * @return the figure
+	 */
+	private IFigure findChildFigurebyVisualID(EditPart classEditPart, String classFloatingNameVisualID) {
+		// Find the floatingLabelFigure
+		IFigure floatingLabelFigure = null;
+		Iterator<?> childsIterator = classEditPart.getChildren().iterator();
+		while (null == floatingLabelFigure && childsIterator.hasNext()) {
+			Object child = childsIterator.next();
+
+			if (child instanceof IGraphicalEditPart && classFloatingNameVisualID.equals(((IGraphicalEditPart) child).getNotationView().getType())) {
+				floatingLabelFigure = (IFigure) ((IGraphicalEditPart) child).getFigure();
+			}
+		}
+		return floatingLabelFigure;
+	}
+
+
+	/**
+	 * Sets the embedded style sheet. Element + "{" + attribut + ":" + value + ";}"
+	 *
+	 * @param Element
+	 *            the element
+	 * @param attribut
+	 *            the attribut
+	 * @param value
+	 *            the value
+	 * @param append
+	 *            the append
+	 * @throws ExecutionException
+	 *             the execution exception
+	 * @throws NotDefinedException
+	 *             the not defined exception
+	 * @throws NotEnabledException
+	 *             the not enabled exception
+	 * @throws NotHandledException
+	 *             the not handled exception
+	 */
+	private void setEmbeddedStyleSheet(final String Element, final String attribut, final String value, final boolean append) throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
+		final EmbeddedStyleSheet embeddedStyleSheet = getEmbeddedStyleSheet(diagram);
+		Assert.assertNotNull(embeddedStyleSheet);
+
+		Command command = new RecordingCommand(modelSetFixture.getEditingDomain()) {
+
+			@Override
+			protected void doExecute() {
+				String str = append ? embeddedStyleSheet.getContent() + "\n" : "";
+				embeddedStyleSheet.setContent(str + Element + "{" + attribut + ":" + value + ";}");
+			}
+		};
+		getCommandStack().execute(command);
+		refreshEditor();
+
+	}
+
+	/**
+	 * Gets the embedded style sheet.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the embedded style sheet
+	 */
+	private EmbeddedStyleSheet getEmbeddedStyleSheet(Diagram diagram) {
+		Iterator<EObject> iterator = diagram.eResource().getContents().iterator();
+		EmbeddedStyleSheet embeddedStyleSheet = null;
+		while (null == embeddedStyleSheet && iterator.hasNext()) {
+			Object object = iterator.next();
+			if (object instanceof EmbeddedStyleSheet) {
+				embeddedStyleSheet = (EmbeddedStyleSheet) object;
+			}
+		}
+		Assert.assertNotNull(embeddedStyleSheet);
+		return embeddedStyleSheet;
+	}
+
+	/**
+	 * Gets the command stack.
+	 *
+	 * @return the command stack
+	 */
+	private CommandStack getCommandStack() {
+		return modelSetFixture.getEditingDomain().getCommandStack();
+	}
+
+	/**
+	 * Refresh editor.
+	 */
+	private void refreshEditor() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
+		String REFRESH_COMMAND_ID = "org.eclipse.ui.file.refresh"; //$NON-NLS-1$
+		ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
+		org.eclipse.core.commands.Command refreshCommand = commandService.getCommand(REFRESH_COMMAND_ID);
+		if (refreshCommand.getHandler().isEnabled()) {
+			refreshCommand.executeWithChecks(new ExecutionEvent());
+		}
+	}
+
+	/**
+	 * Gets the edits the part.
+	 *
+	 * @param semanticElement
+	 *            the semantic element
+	 * @return the edits the part
+	 */
+	private EditPart getEditPart(String semanticElement) {
+
+		modelSetFixture.getPageManager().openPage(diagram);
+
+		View diagramView = DiagramUtils.findShape(diagram, semanticElement);
+		if (diagramView == null) {
+			diagramView = DiagramUtils.findEdge(diagram, semanticElement);
+		}
+		if (diagramView == null) {
+			Iterator<?> iterator = diagram.eAllContents();
+			while (null == diagramView && iterator.hasNext()) {
+				Object object = iterator.next();
+				if (object instanceof View) {
+					diagramView = DiagramUtils.findShape((View) object, semanticElement);
+					if (diagramView == null) {
+						diagramView = DiagramUtils.findEdge((View) object, semanticElement);
+					}
+				}
+			}
+		}
+
+		Assert.assertNotNull(diagramView);
+
+		IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);
+		Assert.assertNotNull(semanticEP);
+
+		return semanticEP;
+	}
+}
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
index a9924eadfda..1f6e709fbd9 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
@@ -10,7 +10,7 @@
 <booleanAttribute key="clearws" value="true"/>
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default" value="true"/>
 <stringAttribute key="deselected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests,org.eclipse.papyrus.customization.properties.tests,org.eclipse.papyrus.editor.integration.tests,org.eclipse.papyrus.infra.extendedtypes.tests,org.eclipse.papyrus.infra.gmfdiag.css.tests,org.eclipse.papyrus.infra.nattable.model.editor.tests,org.eclipse.papyrus.infra.nattable.tests,org.eclipse.papyrus.infra.nattable.views.tests,org.eclipse.papyrus.infra.services.controlmode.tests,org.eclipse.papyrus.infra.services.labelprovider.tests,org.eclipse.papyrus.infra.tools.tests,org.eclipse.papyrus.search.tests,org.eclipse.papyrus.sysml.diagram.requirement.tests,org.eclipse.papyrus.sysml.modelexplorer.tests,org.eclipse.papyrus.sysml.nattable.allocation.tests,org.eclipse.papyrus.sysml.nattable.requirement.tests,org.eclipse.papyrus.sysml.tests,org.eclipse.papyrus.tests,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests,org.eclipse.papyrus.uml.decoratormodel.tests,org.eclipse.papyrus.uml.diagram.activity.tests,org.eclipse.papyrus.uml.diagram.clazz.tests,org.eclipse.papyrus.uml.diagram.common.tests,org.eclipse.papyrus.uml.diagram.communication.tests,org.eclipse.papyrus.uml.diagram.component.tests,org.eclipse.papyrus.uml.diagram.composite.tests,org.eclipse.papyrus.uml.diagram.deployment.tests,org.eclipse.papyrus.uml.diagram.dnd.tests,org.eclipse.papyrus.uml.diagram.interactionoverview.tests,org.eclipse.papyrus.uml.diagram.profile.tests,org.eclipse.papyrus.uml.diagram.sequence.tests,org.eclipse.papyrus.uml.diagram.statemachine.tests,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests,org.eclipse.papyrus.uml.diagram.tests,org.eclipse.papyrus.uml.diagram.timing.tests,org.eclipse.papyrus.uml.diagram.usecase.tests,org.eclipse.papyrus.uml.diagram.wizards.tests,org.eclipse.papyrus.uml.modelexplorer.tests,org.eclipse.papyrus.uml.nattable.generic.tests,org.eclipse.papyrus.uml.nattable.tests,org.eclipse.papyrus.uml.textedit.parameter.tests,org.eclipse.papyrus.uml.textedit.port.tests,org.eclipse.papyrus.uml.textedit.property.tests,org.eclipse.papyrus.uml.textedit.tests,org.eclipse.papyrus.uml.tools.tests,org.eclipse.papyrus.uml.tools.utils.tests,org.eclipse.papyrus.views.modelexplorer.tests"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -24,16 +24,18 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.menu.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M&#13;&#10;-Doomph.setup.skip=true&#13;&#10;-Doomph.setup.questionnaire.skip=true"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.gmf.codegen@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.documentation.plugin.edit@default:default,org.eclipse.papyrus.documentation.plugin.editor@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.commandstack@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview.test@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.xwt@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.ui.tests@default:default,org.eclipse.papyrus.infra.extendedtypes.ui@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.releng.tools@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation
index 8cd1edc6f7c..2b22c0fad9b 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_BwdpMG86EeSG_p8PAYDlLg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_FUB2kG86EeSG_p8PAYDlLg" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FUrW0G86EeSG_p8PAYDlLg" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FUr94G86EeSG_p8PAYDlLg" type="7016">
-        <children xmi:type="notation:Shape" xmi:id="_P9U1UHYxEeSbgutMzIJcYw" type="2008">
-          <children xmi:type="notation:DecorationNode" xmi:id="_P9WqgHYxEeSbgutMzIJcYw" type="5029"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_P9XRkHYxEeSbgutMzIJcYw" type="7017">
+    <children xmi:type="notation:Shape" xmi:id="_FUB2kG86EeSG_p8PAYDlLg" type="Package_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FUrW0G86EeSG_p8PAYDlLg" type="Package_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hf5gkOu7EeWY74UYS4X44A" type="Package_PackagedElementCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_P9U1UHYxEeSbgutMzIJcYw" type="Class_Shape">
+          <children xmi:type="notation:DecorationNode" xmi:id="_P9WqgHYxEeSbgutMzIJcYw" type="Class_NameLabel"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Hf6usOu7EeWY74UYS4X44A" type="Class_AttributeCompartment">
             <styles xmi:type="notation:TitleStyle" xmi:id="_P9XRkXYxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_P9XRknYxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_P9XRk3YxEeSbgutMzIJcYw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P9XRlHYxEeSbgutMzIJcYw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_P9XRlXYxEeSbgutMzIJcYw" type="7018">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Hf7VwOu7EeWY74UYS4X44A" type="Class_OperationCompartment">
             <styles xmi:type="notation:TitleStyle" xmi:id="_P9XRlnYxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_P9XRl3YxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_P9XRmHYxEeSbgutMzIJcYw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P9XRmXYxEeSbgutMzIJcYw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_P9X4oHYxEeSbgutMzIJcYw" type="7019">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Hf780Ou7EeWY74UYS4X44A" type="Class_NestedClassifierCompartment">
             <styles xmi:type="notation:TitleStyle" xmi:id="_P9X4oXYxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_P9X4onYxEeSbgutMzIJcYw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_P9X4o3YxEeSbgutMzIJcYw"/>
@@ -57,21 +57,21 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E21DM3ZLEeS6zJCWmZdMOg" x="512" y="329"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xN4dgHbVEeST0aHn3TAicw" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xOHHAHbVEeST0aHn3TAicw" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xOHuEHbVEeST0aHn3TAicw" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_xN4dgHbVEeST0aHn3TAicw" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xOHHAHbVEeST0aHn3TAicw" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hf_nMOu7EeWY74UYS4X44A" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_xOHuEXbVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_xOHuEnbVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_xOHuE3bVEeST0aHn3TAicw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xOHuFHbVEeST0aHn3TAicw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xOIVIHbVEeST0aHn3TAicw" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgAOQOu7EeWY74UYS4X44A" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_xOIVIXbVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_xOIVInbVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_xOIVI3bVEeST0aHn3TAicw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xOIVJHbVEeST0aHn3TAicw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xOIVJXbVEeST0aHn3TAicw" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgA1UOu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_xOIVJnbVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_xOIVJ3bVEeST0aHn3TAicw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_xOIVKHbVEeST0aHn3TAicw"/>
@@ -80,21 +80,21 @@
       <element xmi:type="uml:Component" href="model.uml#_B6t_IG8_EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xN4dgXbVEeST0aHn3TAicw" x="498" y="71" width="232" height="159"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_fHft0Hb_EeSGV47xTootHw" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_fHuXUHb_EeSGV47xTootHw" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_fHu-YHb_EeSGV47xTootHw" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_fHft0Hb_EeSGV47xTootHw" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fHuXUHb_EeSGV47xTootHw" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgBcYOu7EeWY74UYS4X44A" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_fHu-YXb_EeSGV47xTootHw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_fHu-Ynb_EeSGV47xTootHw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_fHu-Y3b_EeSGV47xTootHw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHu-ZHb_EeSGV47xTootHw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_fHvlcHb_EeSGV47xTootHw" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgCDcOu7EeWY74UYS4X44A" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_fHvlcXb_EeSGV47xTootHw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_fHvlcnb_EeSGV47xTootHw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_fHvlc3b_EeSGV47xTootHw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHvldHb_EeSGV47xTootHw"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_fHvldXb_EeSGV47xTootHw" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgCDceu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_fHvldnb_EeSGV47xTootHw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_fHvld3b_EeSGV47xTootHw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_fHvleHb_EeSGV47xTootHw"/>
@@ -103,21 +103,21 @@
       <element xmi:type="uml:Component" href="model.uml#_fFdtgHb_EeSGV47xTootHw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHft0Xb_EeSGV47xTootHw" x="149" y="300" width="210" height="133"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5sP4QHoHEeSPf9bmYWALSA" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_5sSUgHoHEeSPf9bmYWALSA" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5sS7kHoHEeSPf9bmYWALSA" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_5sP4QHoHEeSPf9bmYWALSA" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5sSUgHoHEeSPf9bmYWALSA" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgCqgOu7EeWY74UYS4X44A" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5sS7kXoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5sTioHoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5sTioXoHEeSPf9bmYWALSA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sTionoHEeSPf9bmYWALSA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5sTio3oHEeSPf9bmYWALSA" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgDRkOu7EeWY74UYS4X44A" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5sTipHoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5sTipXoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5sTipnoHEeSPf9bmYWALSA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sTip3oHEeSPf9bmYWALSA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5sUJsHoHEeSPf9bmYWALSA" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgD4oOu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5sUJsXoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5sUJsnoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5sUJs3oHEeSPf9bmYWALSA"/>
@@ -126,21 +126,21 @@
       <element xmi:type="uml:Component" href="model.uml#__SZSAG8-EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sP4QXoHEeSPf9bmYWALSA" x="908" y="271"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_5sl2gHoHEeSPf9bmYWALSA" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_5smdkHoHEeSPf9bmYWALSA" type="5005"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5smdkXoHEeSPf9bmYWALSA" type="7002">
+    <children xmi:type="notation:Shape" xmi:id="_5sl2gHoHEeSPf9bmYWALSA" type="Component_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5smdkHoHEeSPf9bmYWALSA" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgFGwOu7EeWY74UYS4X44A" type="Component_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5smdknoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5smdk3oHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5smdlHoHEeSPf9bmYWALSA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5smdlXoHEeSPf9bmYWALSA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5smdlnoHEeSPf9bmYWALSA" type="7003">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgFt0Ou7EeWY74UYS4X44A" type="Component_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5smdl3oHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5smdmHoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5smdmXoHEeSPf9bmYWALSA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5smdmnoHEeSPf9bmYWALSA"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_5snEoHoHEeSPf9bmYWALSA" type="7004">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HgGU4Ou7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_5snEoXoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_5snEonoHEeSPf9bmYWALSA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5snEo3oHEeSPf9bmYWALSA"/>
@@ -149,17 +149,17 @@
       <element xmi:type="uml:Component" href="model.uml#_FW6ZMG8_EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sl2gXoHEeSPf9bmYWALSA" x="1014" y="81"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_BwdpMW86EeSG_p8PAYDlLg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_BwdpMW86EeSG_p8PAYDlLg" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_BwdpMm86EeSG_p8PAYDlLg"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_BwdpM286EeSG_p8PAYDlLg">
       <owner xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/>
     </styles>
     <element xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/>
-    <edges xmi:type="notation:Connector" xmi:id="_5tiRsHoHEeSPf9bmYWALSA" type="4008" source="_5sl2gHoHEeSPf9bmYWALSA" target="_5sP4QHoHEeSPf9bmYWALSA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wHoHEeSPf9bmYWALSA" type="6026">
+    <edges xmi:type="notation:Connector" xmi:id="_5tiRsHoHEeSPf9bmYWALSA" type="Dependency_Edge" source="_5sl2gHoHEeSPf9bmYWALSA" target="_5sP4QHoHEeSPf9bmYWALSA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wHoHEeSPf9bmYWALSA" type="Dependency_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_5ti4wXoHEeSPf9bmYWALSA" y="40"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wnoHEeSPf9bmYWALSA" type="6027">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wnoHEeSPf9bmYWALSA" type="Dependency_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_5tjf0HoHEeSPf9bmYWALSA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_5tiRsXoHEeSPf9bmYWALSA"/>
@@ -170,44 +170,44 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_-ZPccG8-EeSkzprKqshrgw" type="PapyrusUMLComponentDiagram" name="NewComponentDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="__dqG0G8-EeSkzprKqshrgw" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="__duYQG8-EeSkzprKqshrgw" type="5004"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__du_UG8-EeSkzprKqshrgw" type="7001">
+    <children xmi:type="notation:Shape" xmi:id="__dqG0G8-EeSkzprKqshrgw" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__duYQG8-EeSkzprKqshrgw" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hv-j8Ou7EeWY74UYS4X44A" type="Component_StructureCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="__du_UW8-EeSkzprKqshrgw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__du_Um8-EeSkzprKqshrgw"/>
       </children>
       <element xmi:type="uml:Component" href="model.uml#__SZSAG8-EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__dqG0W8-EeSkzprKqshrgw" x="211" y="127" width="166" height="139"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_B64-QG8_EeSkzprKqshrgw" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_B66zcG8_EeSkzprKqshrgw" type="5004"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_B67agG8_EeSkzprKqshrgw" type="7001">
+    <children xmi:type="notation:Shape" xmi:id="_B64-QG8_EeSkzprKqshrgw" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_B66zcG8_EeSkzprKqshrgw" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hv-j8eu7EeWY74UYS4X44A" type="Component_StructureCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_B67agW8_EeSkzprKqshrgw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B67agm8_EeSkzprKqshrgw"/>
       </children>
       <element xmi:type="uml:Component" href="model.uml#_B6t_IG8_EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B64-QW8_EeSkzprKqshrgw" x="547" y="164" width="162" height="123"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_FXBt8G8_EeSkzprKqshrgw" type="2002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FXC8EG8_EeSkzprKqshrgw" type="5004"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_FXDjIG8_EeSkzprKqshrgw" type="7001">
+    <children xmi:type="notation:Shape" xmi:id="_FXBt8G8_EeSkzprKqshrgw" type="Component_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FXC8EG8_EeSkzprKqshrgw" type="Component_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hv_LAOu7EeWY74UYS4X44A" type="Component_StructureCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_FXDjIW8_EeSkzprKqshrgw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FXDjIm8_EeSkzprKqshrgw"/>
       </children>
       <element xmi:type="uml:Component" href="model.uml#_FW6ZMG8_EeSkzprKqshrgw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FXBt8W8_EeSkzprKqshrgw" x="459" y="403" width="186" height="133"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_-ZPccW8-EeSkzprKqshrgw" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_-ZPccW8-EeSkzprKqshrgw" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_-ZPccm8-EeSkzprKqshrgw"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_-ZPcc28-EeSkzprKqshrgw">
       <owner xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/>
     </styles>
     <element xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/>
-    <edges xmi:type="notation:Connector" xmi:id="_HlLAgG8_EeSkzprKqshrgw" type="4010" source="_FXBt8G8_EeSkzprKqshrgw" target="__dqG0G8-EeSkzprKqshrgw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_HlNcwG8_EeSkzprKqshrgw" type="6009">
+    <edges xmi:type="notation:Connector" xmi:id="_HlLAgG8_EeSkzprKqshrgw" type="Dependency_Edge" source="_FXBt8G8_EeSkzprKqshrgw" target="__dqG0G8-EeSkzprKqshrgw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HlNcwG8_EeSkzprKqshrgw" type="Dependency_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_HlOD0G8_EeSkzprKqshrgw" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_HlPR8G8_EeSkzprKqshrgw" type="6023">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HlPR8G8_EeSkzprKqshrgw" type="Dependency_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_HlP5AG8_EeSkzprKqshrgw" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_HlLnkG8_EeSkzprKqshrgw"/>