Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2015-12-10 14:26:30 -0500
committerGerrit Code Review @ Eclipse.org2016-03-22 09:45:02 -0400
commite8484696ad8258ca27ca5c622d037c975161ac6b (patch)
tree1640f5e2f80a242ecbc61b2a47fb0fc7fee8873c /tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests
parentac3e24920a8de354a1668d76d59dd549fda9306e (diff)
downloadorg.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.gz
org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.tar.xz
org.eclipse.papyrus-e8484696ad8258ca27ca5c622d037c975161ac6b.zip
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>
Diffstat (limited to 'tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests')
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF71
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch84
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation106
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation518
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation33
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation208
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation575
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation388
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation80
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation117
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation523
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation117
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java515
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java600
14 files changed, 1972 insertions, 1963 deletions
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;
+ }
+}

Back to the top