[CDO] Tests in the integration of CDO in Papyrus have not been updated
with the evolutions of Papyrus and therefore many are failing
- Fix several tests and the integration of CDO in Papyrus
Change-Id: Ibafdac0413fe501a8e642a3e4cd30c7293d1192b
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index 8faecc0..f836e3c 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.papyrus.cdo.core,
org.eclipse.papyrus.cdo.core.admin,
org.eclipse.papyrus.cdo.core.exporter,
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
index 3837351..89adf6e 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
@@ -45,7 +45,7 @@
import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
import org.eclipse.papyrus.cdo.internal.core.controlmode.CDOControlModeParticipant;
import org.eclipse.papyrus.cdo.internal.core.l10n.Messages;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
@@ -234,7 +234,7 @@
for (EObject next : resource.getContents()) {
EPackage ePackage = next.eClass().getEPackage();
- if (ePackage == DiPackage.eINSTANCE) {
+ if (ePackage == ArchitecturePackage.eINSTANCE) {
result = DI_CONTENT;
break;
}
@@ -254,12 +254,16 @@
protected void mergeDIContent(Resource source, Resource destination) {
// snip out the source window manager and get its counterpart
SashWindowsMngr srcMngr = DiUtils.lookupSashWindowsMngr(source);
- EcoreUtil.remove(srcMngr);
+ if (srcMngr != null) {
+ EcoreUtil.remove(srcMngr);
+ }
SashWindowsMngr dstMngr = DiUtils.lookupSashWindowsMngr(destination);
// merge the window manager contents
if (dstMngr == null) {
- destination.getContents().add(0, srcMngr);
+ if (srcMngr != null) {
+ destination.getContents().add(0, srcMngr);
+ }
} else {
SashModel dstModel = dstMngr.getSashModel();
SashModel srcModel = srcMngr.getSashModel();
@@ -284,7 +288,12 @@
}
// and add all of the tables and other content
- destination.getContents().addAll(source.getContents());
+ for (EObject eObject : source.getContents()) {
+ if (eObject.eClass().getEPackage() != ArchitecturePackage.eINSTANCE) {
+ destination.getContents().add(eObject);
+ }
+ }
+
}
protected Diagnostic saveNonimportedModels(IModelImportMapping mapping, CDOTransaction transaction, IProgressMonitor monitor) {
diff --git a/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
index b52642e..b1c3bff 100755
--- a/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
+++ b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
@@ -85,13 +85,13 @@
// all resources named *.di that are empty (new-style DI models)
this.legacyQuery = view.createQuery("ocl", //$NON-NLS-1$
"SashWindowsMngr.allInstances()->collect(oclAsType(ecore::EObject).eResource()).oclAsType(eresource::CDOResource)->union(" + //$NON-NLS-1$
- "eresource::CDOResource.allInstances()->select(uRI.toString().endsWith('.di') and contents->isEmpty()))", //$NON-NLS-1$
+ "eresource::CDOResource.allInstances()->select(uRI.toString().endsWith('.di') and contents->exists(oclIsTypeOf(architecture::ArchitectureDescription)))", //$NON-NLS-1$
DiPackage.Literals.SASH_MODEL);
// Query for new-style models only, used when the repository does not know the DiPackage
// (because it contains no legacy models)
this.query = view.createQuery("ocl", //$NON-NLS-1$
- "eresource::CDOResource.allInstances()->select(uRI.toString().endsWith('.di') and contents->isEmpty())", //$NON-NLS-1$
+ "eresource::CDOResource.allInstances()->select(uRI.toString().endsWith('.di') and contents->exists(oclIsTypeOf(architecture::ArchitectureDescription)))", //$NON-NLS-1$
EresourcePackage.Literals.CDO_RESOURCE);
view.addListener(cdoViewListener);
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index fd215a4..10c4361 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@
org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
org.eclipse.papyrus.cdo.core.tests,
org.eclipse.papyrus.cdo.core.util.tests,
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
index 1e92730..8c549ee 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
@@ -1,17 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="model.notation#_4OB64IgIEeKgsNTItrb1JA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="model.notation#_4OB64IgIEeKgsNTItrb1JA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
index f032e67..5fb8d6e 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4OB64IgIEeKgsNTItrb1JA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4OB64IgIEeKgsNTItrb1JA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
<styles xmi:type="notation:DiagramStyle" xmi:id="_4OB64YgIEeKgsNTItrb1JA"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_VXo7QCm3Eeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="model.uml#_4NgWcIgIEeKgsNTItrb1JA"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_VXo7QSm3Eeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Model" href="model.uml#_4NgWcIgIEeKgsNTItrb1JA"/>
</notation:Diagram>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
index f0388b5..8b5b7fb 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4NgWcIgIEeKgsNTItrb1JA" name="model"/>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4NgWcIgIEeKgsNTItrb1JA" name="model"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
index fab7fb4..c7a4a7f 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
Binary files differ
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
index 38a3140..91a7012 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
Binary files differ
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
index d7988d3..2444da4 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
Binary files differ
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
index e0c0a13..2ed3a96 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
@@ -84,11 +84,11 @@
assertThat(problems.getSeverity(), is(Diagnostic.OK));
assertThat(problems.getChildren().size(), is(0));
- assertResource(new Path("/has_dependencies/exported.di"), "di");
+ assertResource(new Path("/has_dependencies/exported.di"), "architecture");
assertResource(new Path("/has_dependencies/exported.uml"), "uml");
assertResource(new Path("/has_dependencies/exported.notation"), "notation");
- assertResource(new Path("/has_dependents/exported.di"), "di");
+ assertResource(new Path("/has_dependents/exported.di"), "architecture");
assertResource(new Path("/has_dependents/exported.uml"), "uml");
assertResource(new Path("/has_dependents/exported.notation"), "notation");
}
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
index e2db3b1..1035200 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
+++ b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
@@ -22,6 +22,7 @@
import java.io.InputStreamReader;
import java.io.Reader;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -39,6 +40,8 @@
import org.eclipse.papyrus.cdo.core.importer.IModelTransferOperation;
import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
import org.eclipse.papyrus.cdo.core.tests.TestProject;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
import org.junit.After;
@@ -119,13 +122,12 @@
CDOView view = getInternalCheckout().getView();
view.waitForUpdate(commitTime, 10000L);
- assertResource(view.getResource("my_import/combined.di"), "di", 1);
+ assertResource(view.getResource("my_import/combined.di"), "architecture", 1);
assertResource(view.getResource("my_import/combined.uml"), "uml", 2);
assertResource(view.getResource("my_import/combined.notation"), "notation", 2);
- SashWindowsMngr mngr = (SashWindowsMngr) EcoreUtil.getObjectByType(view.getResource("my_import/combined.di").getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
- assertThat(mngr.getSashModel().getWindows().size(), is(2));
- assertThat(mngr.getPageList().getAvailablePage().size(), is(3));
+ Collection<Object> architectureDescriptions = EcoreUtil.getObjectsByType(view.getResource("my_import/combined.di").getContents(), ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION);
+ assertThat(architectureDescriptions.size(), is(1));
}
/**
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index c667a3a..d6ba57c 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@
org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sashwindows.di
Export-Package: org.eclipse.papyrus.cdo.internal.ui.editors.tests;x-internal:=true,
org.eclipse.papyrus.cdo.internal.ui.markers.tests;x-internal:=true,
org.eclipse.papyrus.cdo.internal.ui.views.tests;x-internal:=true,
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
index e7104a7..8c549ee 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
@@ -1,40 +1,2 @@
<?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:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <di:SashWindowsMngr>
- <pageList>
- <availablePage>
- <emfPageIdentifier href="model.notation#_PIsWgHFlEeK8x7zQKtpUFg"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="model.notation#_PIuywHFlEeK8x7zQKtpUFg"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="model.notation#_PIxPAHFlEeK8x7zQKtpUFg"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="model.notation#_PIzrQHFlEeK8x7zQKtpUFg"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="model.notation#_0TYNgJoYEeOBraiw2Bz-fA"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="model.notation#_PIsWgHFlEeK8x7zQKtpUFg"/>
- </children>
- <children>
- <emfPageIdentifier href="model.notation#_PIuywHFlEeK8x7zQKtpUFg"/>
- </children>
- <children>
- <emfPageIdentifier href="model.notation#_PIxPAHFlEeK8x7zQKtpUFg"/>
- </children>
- <children>
- <emfPageIdentifier href="model.notation#_PIzrQHFlEeK8x7zQKtpUFg"/>
- </children>
- </children>
- </windows>
- </sashModel>
- </di:SashWindowsMngr>
-</xmi:XMI>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
index 03fbe3c..039f226 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
@@ -1,9 +1,9 @@
<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
<notation:Diagram xmi:id="_PIsWgHFlEeK8x7zQKtpUFg" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_PIsWgXFlEeK8x7zQKtpUFg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWgnFlEeK8x7zQKtpUFg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWg3FlEeK8x7zQKtpUFg" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_PIsWgXFlEeK8x7zQKtpUFg" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWgnFlEeK8x7zQKtpUFg" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWg3FlEeK8x7zQKtpUFg" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWhHFlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWhXFlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
@@ -12,7 +12,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWiHFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWiXFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWinFlEeK8x7zQKtpUFg" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWinFlEeK8x7zQKtpUFg" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWi3FlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWjHFlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
@@ -21,7 +21,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWj3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWkHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWkXFlEeK8x7zQKtpUFg" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWkXFlEeK8x7zQKtpUFg" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWknFlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWk3FlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
@@ -30,16 +30,19 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWlnFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWl3FlEeK8x7zQKtpUFg"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tfDoMCmsEeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tfDoMSmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="model.uml#_PI4jwnFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWmHFlEeK8x7zQKtpUFg" x="63" y="18"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIsWmXFlEeK8x7zQKtpUFg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWmnFlEeK8x7zQKtpUFg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWm3FlEeK8x7zQKtpUFg" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_PIsWmXFlEeK8x7zQKtpUFg" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWmnFlEeK8x7zQKtpUFg" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWm3FlEeK8x7zQKtpUFg" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWnHFlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWnXFlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_PIsWnnFlEeK8x7zQKtpUFg" type="3012">
+ <children xmi:type="notation:Shape" xmi:id="_PIsWnnFlEeK8x7zQKtpUFg" type="Property_ClassAttributeLabel">
<element xmi:type="uml:Property" href="model.uml#_PI4kH3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWn3FlEeK8x7zQKtpUFg"/>
</children>
@@ -48,7 +51,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWonFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWo3FlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWpHFlEeK8x7zQKtpUFg" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWpHFlEeK8x7zQKtpUFg" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWpXFlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWpnFlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
@@ -57,7 +60,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWqXFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWqnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWq3FlEeK8x7zQKtpUFg" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PIsWq3FlEeK8x7zQKtpUFg" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIsWrHFlEeK8x7zQKtpUFg" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIsWrXFlEeK8x7zQKtpUFg" key="showTitle" value="true"/>
</eAnnotations>
@@ -66,33 +69,51 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIsWsHFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWsXFlEeK8x7zQKtpUFg"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tfDoMimsEeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tfDoMymsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="model.uml#_PI4kHnFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIsWsnFlEeK8x7zQKtpUFg" x="270" y="18"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_SFbYAIQqEeKq_f8GS5X7FQ" type="2009">
- <children xmi:type="notation:DecorationNode" xmi:id="_SFcmIIQqEeKq_f8GS5X7FQ" type="5032"/>
+ <children xmi:type="notation:Shape" xmi:id="_SFbYAIQqEeKq_f8GS5X7FQ" type="PrimitiveType_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_SFcmIIQqEeKq_f8GS5X7FQ" type="PrimitiveType_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tfDoNCmsEeub5o5WSuQ6zg" type="PrimitiveType_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tfDoNSmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SFbYAYQqEeKq_f8GS5X7FQ" x="171" y="198"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SFbYAYQqEeKq_f8GS5X7FQ" x="180" y="198"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_1BURACmyEeub5o5WSuQ6zg" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_1BURASmyEeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BURAymyEeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BURAimyEeub5o5WSuQ6zg" x="380" y="198"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_PIsWs3FlEeK8x7zQKtpUFg"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_te9hkCmsEeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="model.uml#_PI4jwHFlEeK8x7zQKtpUFg"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tfE2UCmsEeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Model" href="model.uml#_PI4jwHFlEeK8x7zQKtpUFg"/>
- <edges xmi:type="notation:Connector" xmi:id="_PIsWtHFlEeK8x7zQKtpUFg" type="4001" source="_PIsWgXFlEeK8x7zQKtpUFg" target="_PIsWmXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWtXFlEeK8x7zQKtpUFg" type="6001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIsWtHFlEeK8x7zQKtpUFg" type="Association_Edge" source="_PIsWgXFlEeK8x7zQKtpUFg" target="_PIsWmXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWtXFlEeK8x7zQKtpUFg" type="Association_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWtnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWt3FlEeK8x7zQKtpUFg" visible="false" type="6002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWt3FlEeK8x7zQKtpUFg" visible="false" type="Association_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWuHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWuXFlEeK8x7zQKtpUFg" type="6003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWuXFlEeK8x7zQKtpUFg" type="Association_TargetRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWunFlEeK8x7zQKtpUFg" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWu3FlEeK8x7zQKtpUFg" type="6005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWu3FlEeK8x7zQKtpUFg" type="Association_SourceRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWvHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWvXFlEeK8x7zQKtpUFg" type="6033">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWvXFlEeK8x7zQKtpUFg" type="Association_SourceMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWvnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIsWv3FlEeK8x7zQKtpUFg" type="6034">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIsWv3FlEeK8x7zQKtpUFg" type="Association_TargetMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIsWwHFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIsWwXFlEeK8x7zQKtpUFg"/>
@@ -100,19 +121,30 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIsWwnFlEeK8x7zQKtpUFg" points="[21, -6, -217, -15]$[204, -41, -34, -50]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIsWw3FlEeK8x7zQKtpUFg" id="(0.79,0.39)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_VftGgIQqEeKq_f8GS5X7FQ" type="4002" source="_PIsWmXFlEeK8x7zQKtpUFg" target="_SFbYAIQqEeKq_f8GS5X7FQ">
- <children xmi:type="notation:DecorationNode" xmi:id="_VftGg4QqEeKq_f8GS5X7FQ" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VftGhIQqEeKq_f8GS5X7FQ" y="40"/>
+ <edges xmi:type="notation:Connector" xmi:id="_VftGgIQqEeKq_f8GS5X7FQ" type="Generalization_Edge" source="_PIsWmXFlEeK8x7zQKtpUFg" target="_SFbYAIQqEeKq_f8GS5X7FQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_VftGg4QqEeKq_f8GS5X7FQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WCcagCmxEeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_VftGhIQqEeKq_f8GS5X7FQ" x="1" y="38"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_VftGgYQqEeKq_f8GS5X7FQ"/>
<element xmi:type="uml:Generalization" href="model.uml#_VZyEsIQqEeKq_f8GS5X7FQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VftGgoQqEeKq_f8GS5X7FQ" points="[-16, 22, 60, -89]$[-70, 102, 6, -9]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VgM1wIQqEeKq_f8GS5X7FQ" id="(0.3482142857142857,0.78)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VgM1wYQqEeKq_f8GS5X7FQ" id="(0.62,0.18)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VgM1wIQqEeKq_f8GS5X7FQ" id="(0.3937007874015748,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VgM1wYQqEeKq_f8GS5X7FQ" id="(0.6,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_1BURBCmyEeub5o5WSuQ6zg" type="StereotypeCommentLink" source="_SFbYAIQqEeKq_f8GS5X7FQ" target="_1BURACmyEeub5o5WSuQ6zg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_1BURBSmyEeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BURCSmyEeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1BURBimyEeub5o5WSuQ6zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BURBymyEeub5o5WSuQ6zg"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BURCCmyEeub5o5WSuQ6zg"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_PIuywHFlEeK8x7zQKtpUFg" type="PapyrusUMLActivityDiagram" name="lifecycle" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_PIuywXFlEeK8x7zQKtpUFg" type="2001" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+ <children xmi:type="notation:Shape" xmi:id="_PIuywXFlEeK8x7zQKtpUFg" type="Activity_Shape" fontName="Lucida Grande" fontHeight="11" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIuywnFlEeK8x7zQKtpUFg" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIuyw3FlEeK8x7zQKtpUFg" key="ShadowFigure_Value" value="false"/>
</eAnnotations>
@@ -122,61 +154,73 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIuyxnFlEeK8x7zQKtpUFg" source="QualifiedName">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIuyx3FlEeK8x7zQKtpUFg" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuyyHFlEeK8x7zQKtpUFg" type="5001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuyyXFlEeK8x7zQKtpUFg" type="7001">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuyyHFlEeK8x7zQKtpUFg" type="Activity_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tlwGECmsEeub5o5WSuQ6zg" type="Activity_ParameterCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIuyynFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIuyy3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuyzHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuyzXFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tlx7QCmsEeub5o5WSuQ6zg" type="Activity_PreconditionCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIuyznFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIuyz3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy0HFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy0XFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tlx7QSmsEeub5o5WSuQ6zg" type="Activity_PostconditionCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIuy0nFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIuy03FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy1HFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy1XFlEeK8x7zQKtpUFg" type="7004">
- <children xmi:type="notation:Shape" xmi:id="_PIuy1nFlEeK8x7zQKtpUFg" type="3004">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy13FlEeK8x7zQKtpUFg" type="5080">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tlyiUCmsEeub5o5WSuQ6zg" type="Activity_ActivityNodeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIuy1nFlEeK8x7zQKtpUFg" type="InitialNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy13FlEeK8x7zQKtpUFg" type="InitialNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuy2HFlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu38SmsEeub5o5WSuQ6zg" type="InitialNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu38imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy2XFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:InitialNode" href="model.uml#_PI4j5HFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy2nFlEeK8x7zQKtpUFg" x="89" y="122"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy23FlEeK8x7zQKtpUFg" type="3005">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy3HFlEeK8x7zQKtpUFg" type="5081">
+ <children xmi:type="notation:Shape" xmi:id="_PIuy23FlEeK8x7zQKtpUFg" type="ActivityFinalNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy3HFlEeK8x7zQKtpUFg" type="ActivityFinalNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuy3XFlEeK8x7zQKtpUFg" y="5"/>
</children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy3nFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ActivityFinalNode" href="model.uml#_PI4j5XFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy33FlEeK8x7zQKtpUFg" x="787" y="186"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy4HFlEeK8x7zQKtpUFg" type="3065">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy4XFlEeK8x7zQKtpUFg" type="5117"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy4nFlEeK8x7zQKtpUFg" type="7005">
- <children xmi:type="notation:Shape" xmi:id="_PIuy43FlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy5HFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIuy4HFlEeK8x7zQKtpUFg" type="StructuredActivityNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy4XFlEeK8x7zQKtpUFg" type="StructuredActivityNode_KeywordLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tlzwcCmsEeub5o5WSuQ6zg" type="StructuredActivityNode_ActivityNodeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIuy43FlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy5HFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu38ymsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu39CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy5XFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4jyHFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy5nFlEeK8x7zQKtpUFg" x="30" y="66"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy53FlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy6HFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIuy53FlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy6HFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu39SmsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu39imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy6XFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4jyXFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy6nFlEeK8x7zQKtpUFg" x="138" y="66"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy63FlEeK8x7zQKtpUFg" type="3038">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy7HFlEeK8x7zQKtpUFg" type="5043">
+ <children xmi:type="notation:Shape" xmi:id="_PIuy63FlEeK8x7zQKtpUFg" type="DecisionNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy7HFlEeK8x7zQKtpUFg" type="DecisionNode_DecisionInputLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuy7XFlEeK8x7zQKtpUFg" y="5"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy7nFlEeK8x7zQKtpUFg" type="5098">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy7nFlEeK8x7zQKtpUFg" type="DecisionNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuy73FlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu39ymsEeub5o5WSuQ6zg" type="DecisionNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu3-CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy8HFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:DecisionNode" href="model.uml#_PI4jynFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy8XFlEeK8x7zQKtpUFg" x="246" y="66"/>
@@ -187,31 +231,43 @@
<element xmi:type="uml:StructuredActivityNode" href="model.uml#_PI4jx3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy9HFlEeK8x7zQKtpUFg" x="76" y="192" width="280" height="154"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy9XFlEeK8x7zQKtpUFg" type="3067">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy9nFlEeK8x7zQKtpUFg" type="5118"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy93FlEeK8x7zQKtpUFg" type="7006">
- <children xmi:type="notation:Shape" xmi:id="_PIuy-HFlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuy-XFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIuy9XFlEeK8x7zQKtpUFg" type="ActivityPartition_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy9nFlEeK8x7zQKtpUFg" type="ActivityPartition_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tl0XgCmsEeub5o5WSuQ6zg" type="ActivityPartition_ActivityNodeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIuy-HFlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuy-XFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu3-ymsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu3_CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy-nFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4j5nFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy-3FlEeK8x7zQKtpUFg" x="85" y="52"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy_HFlEeK8x7zQKtpUFg"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu3-SmsEeub5o5WSuQ6zg" type="ActivityPartition_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu3-imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuy_XFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ActivityPartition" href="model.uml#_PI4jy3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuy_nFlEeK8x7zQKtpUFg" x="391" y="30" width="239" height="148"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuy_3FlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzAHFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIuy_3FlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzAHFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu3_SmsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu3_imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuzAXFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4j53FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuzAnFlEeK8x7zQKtpUFg" x="497" y="288"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIuzA3FlEeK8x7zQKtpUFg" type="3039">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzBHFlEeK8x7zQKtpUFg" type="5099">
+ <children xmi:type="notation:Shape" xmi:id="_PIuzA3FlEeK8x7zQKtpUFg" type="MergeNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzBHFlEeK8x7zQKtpUFg" type="MergeNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzBXFlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_tlu3_ymsEeub5o5WSuQ6zg" type="MergeNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_tlu4ACmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIuzBnFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:MergeNode" href="model.uml#_PI4j6HFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuzB3FlEeK8x7zQKtpUFg" x="715" y="183"/>
@@ -222,18 +278,22 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIuzCXFlEeK8x7zQKtpUFg"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_PIuzCnFlEeK8x7zQKtpUFg"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_tlu38CmsEeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.activity">
+ <owner xmi:type="uml:Activity" href="model.uml#_PI4jxnFlEeK8x7zQKtpUFg"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tl1loCmsEeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Activity" href="model.uml#_PI4jxnFlEeK8x7zQKtpUFg"/>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzC3FlEeK8x7zQKtpUFg" type="4004" source="_PIuy1nFlEeK8x7zQKtpUFg" target="_PIuy43FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzDHFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzC3FlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy1nFlEeK8x7zQKtpUFg" target="_PIuy43FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzDHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzDXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzDnFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzDnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzD3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzEHFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzEHFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzEXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzEnFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzEnFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzE3FlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzFHFlEeK8x7zQKtpUFg"/>
@@ -241,17 +301,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzFXFlEeK8x7zQKtpUFg" points="[1, 3, -39, -143]$[39, 126, -1, -20]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIuzFnFlEeK8x7zQKtpUFg" id="(0.45,0.8)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzF3FlEeK8x7zQKtpUFg" type="4004" source="_PIuy43FlEeK8x7zQKtpUFg" target="_PIuy53FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzGHFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzF3FlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy43FlEeK8x7zQKtpUFg" target="_PIuy53FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzGHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzGXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzGnFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzGnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzG3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzHHFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzHHFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzHXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzHnFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzHnFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzH3FlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzIHFlEeK8x7zQKtpUFg"/>
@@ -259,51 +319,51 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzIXFlEeK8x7zQKtpUFg" points="[11, 2, -73, -1]$[88, -17, 4, -20]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIuzInFlEeK8x7zQKtpUFg" id="(0.8428571428571429,0.425)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzI3FlEeK8x7zQKtpUFg" type="4004" source="_PIuy53FlEeK8x7zQKtpUFg" target="_PIuy63FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzJHFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzI3FlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy53FlEeK8x7zQKtpUFg" target="_PIuy63FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzJHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzJXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzJnFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzJnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzJ3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzKHFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzKHFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzKXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzKnFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzKnFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzK3FlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzLHFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ControlFlow" href="model.uml#_PI4j0nFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzLXFlEeK8x7zQKtpUFg" points="[35, -4, -48, 1]$[82, 8, -1, 13]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzLnFlEeK8x7zQKtpUFg" type="4004" source="_PIuy63FlEeK8x7zQKtpUFg" target="_PIuy-HFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzL3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzLnFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy63FlEeK8x7zQKtpUFg" target="_PIuy-HFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzL3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzMHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzMXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzMXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzMnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzM3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzM3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzNHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzNXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzNXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzNnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzN3FlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ControlFlow" href="model.uml#_PI4j1XFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzOHFlEeK8x7zQKtpUFg" points="[6, -6, -181, 151]$[189, -137, 2, 20]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzOXFlEeK8x7zQKtpUFg" type="4004" source="_PIuy63FlEeK8x7zQKtpUFg" target="_PIuy_3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzOnFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzOXFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy63FlEeK8x7zQKtpUFg" target="_PIuy_3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzOnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzO3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzPHFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzPHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzPXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzPnFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzPnFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzP3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzQHFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzQHFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzQXFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzQnFlEeK8x7zQKtpUFg"/>
@@ -311,17 +371,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzQ3FlEeK8x7zQKtpUFg" points="[13, 2, -195, -27]$[243, 37, 35, 8]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIuzRHFlEeK8x7zQKtpUFg" id="(0.25,0.5)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzRXFlEeK8x7zQKtpUFg" type="4004" source="_PIuy_3FlEeK8x7zQKtpUFg" target="_PIuzA3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzRnFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzRXFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy_3FlEeK8x7zQKtpUFg" target="_PIuzA3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzRnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzR3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzSHFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzSHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzSXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzSnFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzSnFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzS3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzTHFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzTHFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzTXFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzTnFlEeK8x7zQKtpUFg"/>
@@ -329,34 +389,34 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzT3FlEeK8x7zQKtpUFg" points="[16, -11, -158, 103]$[174, -114, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIuzUHFlEeK8x7zQKtpUFg" id="(0.7714285714285715,0.6)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIuzUXFlEeK8x7zQKtpUFg" type="4004" source="_PIuy-HFlEeK8x7zQKtpUFg" target="_PIuzA3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzUnFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIuzUXFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuy-HFlEeK8x7zQKtpUFg" target="_PIuzA3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzUnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzU3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzVHFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzVHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzVXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzVnFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzVnFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzV3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIuzWHFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIuzWHFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIuzWXFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIuzWnFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ControlFlow" href="model.uml#_PI4j3nFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIuzW3FlEeK8x7zQKtpUFg" points="[35, 12, -174, -64]$[208, 62, -1, -14]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIvZ0HFlEeK8x7zQKtpUFg" type="4004" source="_PIuzA3FlEeK8x7zQKtpUFg" target="_PIuy23FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ0XFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIvZ0HFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIuzA3FlEeK8x7zQKtpUFg" target="_PIuy23FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ0XFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIvZ0nFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ03FlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ03FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIvZ1HFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ1XFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ1XFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIvZ1nFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ13FlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIvZ13FlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIvZ2HFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIvZ2XFlEeK8x7zQKtpUFg"/>
@@ -365,7 +425,7 @@
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_PIxPAHFlEeK8x7zQKtpUFg" type="PapyrusUMLStateMachineDiagram" name="fsm" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_PIxPAXFlEeK8x7zQKtpUFg" type="2000" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPAXFlEeK8x7zQKtpUFg" type="StateMachine_Shape" fontName="Lucida Grande" fontHeight="11" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIxPAnFlEeK8x7zQKtpUFg" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIxPA3FlEeK8x7zQKtpUFg" key="ShadowFigure_Value" value="false"/>
</eAnnotations>
@@ -375,11 +435,11 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIxPBnFlEeK8x7zQKtpUFg" source="QualifiedName">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIxPB3FlEeK8x7zQKtpUFg" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPCHFlEeK8x7zQKtpUFg" type="2001">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPCHFlEeK8x7zQKtpUFg" type="StateMachine_NameLabel">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPCXFlEeK8x7zQKtpUFg" width="700" height="13"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPCnFlEeK8x7zQKtpUFg" type="2002">
- <children xmi:type="notation:Shape" xmi:id="_PIxPC3FlEeK8x7zQKtpUFg" type="3000" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp174CmsEeub5o5WSuQ6zg" type="StateMachine_RegionCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPC3FlEeK8x7zQKtpUFg" type="Region_Shape" fontName="Lucida Grande" fontHeight="11" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIxPDHFlEeK8x7zQKtpUFg" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIxPDXFlEeK8x7zQKtpUFg" key="ShadowFigure_Value" value="false"/>
</eAnnotations>
@@ -392,38 +452,38 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIxPEnFlEeK8x7zQKtpUFg" source="RegionAnnotationKey">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIxPE3FlEeK8x7zQKtpUFg" key="RegionZoneKey" value="L"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPFHFlEeK8x7zQKtpUFg" type="3002">
- <children xmi:type="notation:Shape" xmi:id="_PIxPFXFlEeK8x7zQKtpUFg" type="8000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPFnFlEeK8x7zQKtpUFg" type="8001">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp2i8CmsEeub5o5WSuQ6zg" type="Region_SubvertexCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPFXFlEeK8x7zQKtpUFg" type="Pseudostate_InitialShape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPFnFlEeK8x7zQKtpUFg" type="Pseudostate_InitialFloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPF3FlEeK8x7zQKtpUFg" x="25" y="3"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPGHFlEeK8x7zQKtpUFg" type="8002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPGHFlEeK8x7zQKtpUFg" type="Pseudostate_InitialStereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPGXFlEeK8x7zQKtpUFg" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="model.uml#_PI4j7nFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPGnFlEeK8x7zQKtpUFg" x="51" y="53"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPG3FlEeK8x7zQKtpUFg" type="6000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPHHFlEeK8x7zQKtpUFg" type="6001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPHXFlEeK8x7zQKtpUFg" type="6002">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPG3FlEeK8x7zQKtpUFg" type="State_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPHHFlEeK8x7zQKtpUFg" type="State_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp3KACmsEeub5o5WSuQ6zg" type="State_RegionCompartment">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPHnFlEeK8x7zQKtpUFg"/>
</children>
<element xmi:type="uml:State" href="model.uml#_PI4j73FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPH3FlEeK8x7zQKtpUFg" x="96" y="164"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPIHFlEeK8x7zQKtpUFg" type="6000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPIXFlEeK8x7zQKtpUFg" type="6001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPInFlEeK8x7zQKtpUFg" type="6002">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPIHFlEeK8x7zQKtpUFg" type="State_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPIXFlEeK8x7zQKtpUFg" type="State_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp3KASmsEeub5o5WSuQ6zg" type="State_RegionCompartment">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPI3FlEeK8x7zQKtpUFg"/>
</children>
<element xmi:type="uml:State" href="model.uml#_PI4j8HFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPJHFlEeK8x7zQKtpUFg" x="240" y="164"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPJXFlEeK8x7zQKtpUFg" type="5000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPJnFlEeK8x7zQKtpUFg" type="5001">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPJXFlEeK8x7zQKtpUFg" type="FinalState_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPJnFlEeK8x7zQKtpUFg" type="FinalState_FloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPJ3FlEeK8x7zQKtpUFg" x="25" y="3"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPKHFlEeK8x7zQKtpUFg" type="5002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPKHFlEeK8x7zQKtpUFg" type="FinalState_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPKXFlEeK8x7zQKtpUFg" x="25" y="-10"/>
</children>
<element xmi:type="uml:FinalState" href="model.uml#_PI4j8XFlEeK8x7zQKtpUFg"/>
@@ -434,42 +494,42 @@
<element xmi:type="uml:Region" href="model.uml#_PI4j6nFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPLHFlEeK8x7zQKtpUFg" width="350" height="287"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPLXFlEeK8x7zQKtpUFg" type="3000">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPLXFlEeK8x7zQKtpUFg" type="Region_Shape">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIxPLnFlEeK8x7zQKtpUFg" source="RegionAnnotationKey">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIxPL3FlEeK8x7zQKtpUFg" key="RegionZoneKey" value="R"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPMHFlEeK8x7zQKtpUFg" type="3002">
- <children xmi:type="notation:Shape" xmi:id="_PIxPMXFlEeK8x7zQKtpUFg" type="6000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPMnFlEeK8x7zQKtpUFg" type="6001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPM3FlEeK8x7zQKtpUFg" type="6002">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp3xECmsEeub5o5WSuQ6zg" type="Region_SubvertexCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPMXFlEeK8x7zQKtpUFg" type="State_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPMnFlEeK8x7zQKtpUFg" type="State_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp3xESmsEeub5o5WSuQ6zg" type="State_RegionCompartment">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPNHFlEeK8x7zQKtpUFg"/>
</children>
<element xmi:type="uml:State" href="model.uml#_PI4j-HFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPNXFlEeK8x7zQKtpUFg" x="79" y="110"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPNnFlEeK8x7zQKtpUFg" type="6000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPN3FlEeK8x7zQKtpUFg" type="6001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPOHFlEeK8x7zQKtpUFg" type="6002">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPNnFlEeK8x7zQKtpUFg" type="State_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPN3FlEeK8x7zQKtpUFg" type="State_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tp4YICmsEeub5o5WSuQ6zg" type="State_RegionCompartment">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPOXFlEeK8x7zQKtpUFg"/>
</children>
<element xmi:type="uml:State" href="model.uml#_PI4j-XFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPOnFlEeK8x7zQKtpUFg" x="205" y="119"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPO3FlEeK8x7zQKtpUFg" type="9000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPPHFlEeK8x7zQKtpUFg" type="9001">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPO3FlEeK8x7zQKtpUFg" type="Pseudostate_JoinShape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPPHFlEeK8x7zQKtpUFg" type="Pseudostate_JoinFloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPPXFlEeK8x7zQKtpUFg" x="25" y="3"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPPnFlEeK8x7zQKtpUFg" type="9002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPPnFlEeK8x7zQKtpUFg" type="Pseudostate_JoinStereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPP3FlEeK8x7zQKtpUFg" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="model.uml#_PI4j-nFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPQHFlEeK8x7zQKtpUFg" x="168" y="49"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIxPQXFlEeK8x7zQKtpUFg" type="10000">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPQnFlEeK8x7zQKtpUFg" type="10001">
+ <children xmi:type="notation:Shape" xmi:id="_PIxPQXFlEeK8x7zQKtpUFg" type="Pseudostate_ForkShape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPQnFlEeK8x7zQKtpUFg" type="Pseudostate_ForkFloatingNameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPQ3FlEeK8x7zQKtpUFg" x="25" y="3"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPRHFlEeK8x7zQKtpUFg" type="10002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPRHFlEeK8x7zQKtpUFg" type="Pseudostate_ForkStereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPRXFlEeK8x7zQKtpUFg" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="model.uml#_PI4j-3FlEeK8x7zQKtpUFg"/>
@@ -486,57 +546,61 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIxPSnFlEeK8x7zQKtpUFg" x="30" y="30" width="700" height="300"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_PIxPS3FlEeK8x7zQKtpUFg"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_tp1U0CmsEeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.stateMachine">
+ <owner xmi:type="uml:StateMachine" href="model.uml#_PI4j6XFlEeK8x7zQKtpUFg"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_tp4_MCmsEeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:StateMachine" href="model.uml#_PI4j6XFlEeK8x7zQKtpUFg"/>
- <edges xmi:type="notation:Connector" xmi:id="_PIxPTHFlEeK8x7zQKtpUFg" type="7000" source="_PIxPFXFlEeK8x7zQKtpUFg" target="_PIxPG3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPTXFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIxPTHFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPFXFlEeK8x7zQKtpUFg" target="_PIxPG3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPTXFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPTnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPT3FlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPT3FlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPUHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPUXFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPUXFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPUnFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIxPU3FlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:Transition" href="model.uml#_PI4j63FlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIxPVHFlEeK8x7zQKtpUFg" points="[4, 10, -51, -111]$[52, 101, -3, -20]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIxPVXFlEeK8x7zQKtpUFg" type="7000" source="_PIxPG3FlEeK8x7zQKtpUFg" target="_PIxPIHFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPVnFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIxPVXFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPG3FlEeK8x7zQKtpUFg" target="_PIxPIHFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPVnFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPV3FlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPWHFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPWHFlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIxPWXFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIxPWnFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIxPWnFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2EHFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2EXFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:Transition" href="model.uml#_PI4j7HFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIx2EnFlEeK8x7zQKtpUFg" points="[20, 7, -105, 6]$[128, 21, 3, 20]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2E3FlEeK8x7zQKtpUFg" type="7000" source="_PIxPIHFlEeK8x7zQKtpUFg" target="_PIxPQXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2FHFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2E3FlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPIHFlEeK8x7zQKtpUFg" target="_PIxPQXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2FHFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2FXFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2FnFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2FnFlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2F3FlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2GHFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2GHFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2GXFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2GnFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:Transition" href="model.uml#_PI4j7XFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIx2G3FlEeK8x7zQKtpUFg" points="[20, 1, -267, -21]$[287, 17, 0, -5]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2HHFlEeK8x7zQKtpUFg" type="7000" source="_PIxPQXFlEeK8x7zQKtpUFg" target="_PIxPMXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2HXFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2HHFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPQXFlEeK8x7zQKtpUFg" target="_PIxPMXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2HXFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2HnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2H3FlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2H3FlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2IHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2IXFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2IXFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2InFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2I3FlEeK8x7zQKtpUFg"/>
@@ -544,14 +608,14 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIx2JHFlEeK8x7zQKtpUFg" points="[-2, -2, 77, 72]$[-74, -94, 5, -20]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIx2JXFlEeK8x7zQKtpUFg" id="(0.5,0.2)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2JnFlEeK8x7zQKtpUFg" type="7000" source="_PIxPQXFlEeK8x7zQKtpUFg" target="_PIxPNnFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2J3FlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2JnFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPQXFlEeK8x7zQKtpUFg" target="_PIxPNnFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2J3FlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2KHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2KXFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2KXFlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2KnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2K3FlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2K3FlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2LHFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2LXFlEeK8x7zQKtpUFg"/>
@@ -559,14 +623,14 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIx2LnFlEeK8x7zQKtpUFg" points="[5, -6, -49, 50]$[58, -48, 4, 8]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIx2L3FlEeK8x7zQKtpUFg" id="(0.675,0.8)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2MHFlEeK8x7zQKtpUFg" type="7000" source="_PIxPMXFlEeK8x7zQKtpUFg" target="_PIxPO3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2MXFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2MHFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPMXFlEeK8x7zQKtpUFg" target="_PIxPO3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2MXFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2MnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2M3FlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2M3FlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2NHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2NXFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2NXFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2NnFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2N3FlEeK8x7zQKtpUFg"/>
@@ -575,28 +639,28 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIx2OXFlEeK8x7zQKtpUFg" id="(0.325,0.125)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIx2OnFlEeK8x7zQKtpUFg" id="(0.2,0.7)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2O3FlEeK8x7zQKtpUFg" type="7000" source="_PIxPNnFlEeK8x7zQKtpUFg" target="_PIxPO3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2PHFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2O3FlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPNnFlEeK8x7zQKtpUFg" target="_PIxPO3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2PHFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2PXFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2PnFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2PnFlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2P3FlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2QHFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2QHFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2QXFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2QnFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:Transition" href="model.uml#_PI4j9nFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIx2Q3FlEeK8x7zQKtpUFg" points="[-13, -20, 39, 65]$[-52, -80, 0, 5]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIx2RHFlEeK8x7zQKtpUFg" type="7000" source="_PIxPO3FlEeK8x7zQKtpUFg" target="_PIxPJXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2RXFlEeK8x7zQKtpUFg" type="7001">
+ <edges xmi:type="notation:Connector" xmi:id="_PIx2RHFlEeK8x7zQKtpUFg" type="Transition_Edge" source="_PIxPO3FlEeK8x7zQKtpUFg" target="_PIxPJXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2RXFlEeK8x7zQKtpUFg" type="Transition_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2RnFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2R3FlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2R3FlEeK8x7zQKtpUFg" type="Transition_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2SHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIx2SXFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIx2SXFlEeK8x7zQKtpUFg" type="Transition_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIx2SnFlEeK8x7zQKtpUFg" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIx2S3FlEeK8x7zQKtpUFg"/>
@@ -605,7 +669,7 @@
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_PIzrQHFlEeK8x7zQKtpUFg" type="PapyrusUMLActivityDiagram" name="activity2" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_PIzrQXFlEeK8x7zQKtpUFg" type="2001" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+ <children xmi:type="notation:Shape" xmi:id="_PIzrQXFlEeK8x7zQKtpUFg" type="Activity_Shape" fontName="Lucida Grande" fontHeight="11" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIzrQnFlEeK8x7zQKtpUFg" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIzrQ3FlEeK8x7zQKtpUFg" key="ShadowFigure_Value" value="false"/>
</eAnnotations>
@@ -615,87 +679,111 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PIzrRnFlEeK8x7zQKtpUFg" source="QualifiedName">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PIzrR3FlEeK8x7zQKtpUFg" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrSHFlEeK8x7zQKtpUFg" type="5001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrSXFlEeK8x7zQKtpUFg" type="7001">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrSHFlEeK8x7zQKtpUFg" type="Activity_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_trilACmsEeub5o5WSuQ6zg" type="Activity_ParameterCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIzrSnFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIzrS3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrTHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrTXFlEeK8x7zQKtpUFg" type="7002">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_trjMECmsEeub5o5WSuQ6zg" type="Activity_PreconditionCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIzrTnFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIzrT3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrUHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrUXFlEeK8x7zQKtpUFg" type="7003">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_trjMESmsEeub5o5WSuQ6zg" type="Activity_PostconditionCompartment">
<styles xmi:type="notation:SortingStyle" xmi:id="_PIzrUnFlEeK8x7zQKtpUFg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PIzrU3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrVHFlEeK8x7zQKtpUFg"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrVXFlEeK8x7zQKtpUFg" type="7004">
- <children xmi:type="notation:Shape" xmi:id="_PIzrVnFlEeK8x7zQKtpUFg" type="3004">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrV3FlEeK8x7zQKtpUFg" type="5080">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_trjzICmsEeub5o5WSuQ6zg" type="Activity_ActivityNodeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIzrVnFlEeK8x7zQKtpUFg" type="InitialNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrV3FlEeK8x7zQKtpUFg" type="InitialNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrWHFlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh98SmsEeub5o5WSuQ6zg" type="InitialNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh98imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrWXFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:InitialNode" href="model.uml#_PI4kFnFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrWnFlEeK8x7zQKtpUFg" x="45" y="84"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzrW3FlEeK8x7zQKtpUFg" type="3067">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrXHFlEeK8x7zQKtpUFg" type="5118"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrXXFlEeK8x7zQKtpUFg" type="7006">
- <children xmi:type="notation:Shape" xmi:id="_PIzrXnFlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrX3FlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIzrW3FlEeK8x7zQKtpUFg" type="ActivityPartition_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrXHFlEeK8x7zQKtpUFg" type="ActivityPartition_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_trkaMCmsEeub5o5WSuQ6zg" type="ActivityPartition_ActivityNodeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_PIzrXnFlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrX3FlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh99SmsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh99imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrYHFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4kGHFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrYXFlEeK8x7zQKtpUFg" x="85" y="100"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzrYnFlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrY3FlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIzrYnFlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrY3FlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh99ymsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh9-CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrZHFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4kGXFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrZXFlEeK8x7zQKtpUFg" x="85" y="268"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrZnFlEeK8x7zQKtpUFg"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh98ymsEeub5o5WSuQ6zg" type="ActivityPartition_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh99CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrZ3FlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ActivityPartition" href="model.uml#_PI4j_XFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzraHFlEeK8x7zQKtpUFg" x="283" y="-6" width="244" height="397"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzraXFlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzranFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIzraXFlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzranFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh9-SmsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh9-imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzra3FlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4kF3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrbHFlEeK8x7zQKtpUFg" x="106" y="210"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzrbXFlEeK8x7zQKtpUFg" type="3007">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrbnFlEeK8x7zQKtpUFg" type="5003"/>
+ <children xmi:type="notation:Shape" xmi:id="_PIzrbXFlEeK8x7zQKtpUFg" type="OpaqueAction_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrbnFlEeK8x7zQKtpUFg" type="OpaqueAction_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh9-ymsEeub5o5WSuQ6zg" type="OpaqueAction_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh9_CmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrb3FlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:OpaqueAction" href="model.uml#_PI4kGnFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrcHFlEeK8x7zQKtpUFg" x="670" y="210"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzrcXFlEeK8x7zQKtpUFg" type="3005">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrcnFlEeK8x7zQKtpUFg" type="5081">
+ <children xmi:type="notation:Shape" xmi:id="_PIzrcXFlEeK8x7zQKtpUFg" type="ActivityFinalNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrcnFlEeK8x7zQKtpUFg" type="ActivityFinalNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrc3FlEeK8x7zQKtpUFg" y="5"/>
</children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrdHFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ActivityFinalNode" href="model.uml#_PI4kG3FlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrdXFlEeK8x7zQKtpUFg" x="742" y="84"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzrdnFlEeK8x7zQKtpUFg" type="3040">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrd3FlEeK8x7zQKtpUFg" type="5100">
+ <children xmi:type="notation:Shape" xmi:id="_PIzrdnFlEeK8x7zQKtpUFg" type="ForkNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrd3FlEeK8x7zQKtpUFg" type="ForkNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzreHFlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh9_SmsEeub5o5WSuQ6zg" type="ForkNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh9_imsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzreXFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ForkNode" href="model.uml#_PI4kHHFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrenFlEeK8x7zQKtpUFg" x="229" y="210"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_PIzre3FlEeK8x7zQKtpUFg" type="3041">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrfHFlEeK8x7zQKtpUFg" type="5042">
+ <children xmi:type="notation:Shape" xmi:id="_PIzre3FlEeK8x7zQKtpUFg" type="JoinNode_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrfHFlEeK8x7zQKtpUFg" type="JoinNode_JoinSpecLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrfXFlEeK8x7zQKtpUFg" y="5"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrfnFlEeK8x7zQKtpUFg" type="5101">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrfnFlEeK8x7zQKtpUFg" type="JoinNode_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrf3FlEeK8x7zQKtpUFg" y="5"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_trh9_ymsEeub5o5WSuQ6zg" type="JoinNode_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_trh-ACmsEeub5o5WSuQ6zg" y="5"/>
+ </children>
<styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_PIzrgHFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:JoinNode" href="model.uml#_PI4kHXFlEeK8x7zQKtpUFg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrgXFlEeK8x7zQKtpUFg" x="598" y="210"/>
@@ -706,18 +794,22 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PIzrg3FlEeK8x7zQKtpUFg"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_PIzrhHFlEeK8x7zQKtpUFg"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_trh98CmsEeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.activity">
+ <owner xmi:type="uml:Activity" href="model.uml#_PI4j_HFlEeK8x7zQKtpUFg"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_trlBQCmsEeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Activity" href="model.uml#_PI4j_HFlEeK8x7zQKtpUFg"/>
- <edges xmi:type="notation:Connector" xmi:id="_PIzrhXFlEeK8x7zQKtpUFg" type="4004" source="_PIzrVnFlEeK8x7zQKtpUFg" target="_PIzraXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrhnFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIzrhXFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrVnFlEeK8x7zQKtpUFg" target="_PIzraXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrhnFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrh3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzriHFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzriHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzriXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrinFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrinFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzri3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrjHFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrjHFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrjXFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIzrjnFlEeK8x7zQKtpUFg"/>
@@ -725,34 +817,34 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIzrj3FlEeK8x7zQKtpUFg" points="[4, 8, -63, -118]$[51, 117, -16, -9]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIzrkHFlEeK8x7zQKtpUFg" id="(0.22857142857142856,0.25)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIzrkXFlEeK8x7zQKtpUFg" type="4004" source="_PIzraXFlEeK8x7zQKtpUFg" target="_PIzrdnFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrknFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIzrkXFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzraXFlEeK8x7zQKtpUFg" target="_PIzrdnFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrknFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrk3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrlHFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrlHFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrlXFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrlnFlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrlnFlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrl3FlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrmHFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrmHFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PIzrmXFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PIzrmnFlEeK8x7zQKtpUFg"/>
<element xmi:type="uml:ControlFlow" href="model.uml#_PI4kAXFlEeK8x7zQKtpUFg"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PIzrm3FlEeK8x7zQKtpUFg" points="[35, 0, -58, 0]$[88, 0, -5, 0]"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PIzrnHFlEeK8x7zQKtpUFg" type="4004" source="_PIzrdnFlEeK8x7zQKtpUFg" target="_PIzrXnFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PIzrnXFlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PIzrnHFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrdnFlEeK8x7zQKtpUFg" target="_PIzrXnFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PIzrnXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SUHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SUXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SUXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SUnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SU3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SU3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SVHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SVXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SVXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SVnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0SV3FlEeK8x7zQKtpUFg"/>
@@ -760,17 +852,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PI0SWHFlEeK8x7zQKtpUFg" points="[4, -2, -169, 83]$[138, -80, -35, 5]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0SWXFlEeK8x7zQKtpUFg" id="(0.6,0.15)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PI0SWnFlEeK8x7zQKtpUFg" type="4004" source="_PIzrdnFlEeK8x7zQKtpUFg" target="_PIzrYnFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SW3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PI0SWnFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrdnFlEeK8x7zQKtpUFg" target="_PIzrYnFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SW3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SXHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SXXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SXXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SXnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SX3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SX3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SYHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SYXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SYXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SYnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0SY3FlEeK8x7zQKtpUFg"/>
@@ -778,17 +870,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PI0SZHFlEeK8x7zQKtpUFg" points="[5, 2, -150, -71]$[139, 73, -16, 0]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0SZXFlEeK8x7zQKtpUFg" id="(0.22857142857142856,0.525)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PI0SZnFlEeK8x7zQKtpUFg" type="4004" source="_PIzrXnFlEeK8x7zQKtpUFg" target="_PIzre3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SZ3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PI0SZnFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrXnFlEeK8x7zQKtpUFg" target="_PIzre3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SZ3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SaHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SaXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SaXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SanFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sa3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sa3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SbHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SbXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SbXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SbnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0Sb3FlEeK8x7zQKtpUFg"/>
@@ -796,17 +888,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PI0ScHFlEeK8x7zQKtpUFg" points="[16, 8, -160, -85]$[176, 73, 0, -20]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0ScXFlEeK8x7zQKtpUFg" id="(0.7714285714285715,0.65)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PI0ScnFlEeK8x7zQKtpUFg" type="4004" source="_PIzrYnFlEeK8x7zQKtpUFg" target="_PIzre3FlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sc3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PI0ScnFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrYnFlEeK8x7zQKtpUFg" target="_PIzre3FlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sc3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SdHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SdXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SdXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SdnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sd3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sd3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SeHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SeXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SeXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SenFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0Se3FlEeK8x7zQKtpUFg"/>
@@ -814,17 +906,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PI0SfHFlEeK8x7zQKtpUFg" points="[17, -7, -160, 65]$[175, -52, -2, 20]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0SfXFlEeK8x7zQKtpUFg" id="(0.7571428571428571,0.5)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PI0SfnFlEeK8x7zQKtpUFg" type="4004" source="_PIzre3FlEeK8x7zQKtpUFg" target="_PIzrbXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sf3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PI0SfnFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzre3FlEeK8x7zQKtpUFg" target="_PIzrbXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sf3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SgHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SgXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SgXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SgnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sg3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sg3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0ShHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0ShXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0ShXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0ShnFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0Sh3FlEeK8x7zQKtpUFg"/>
@@ -832,17 +924,17 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PI0SiHFlEeK8x7zQKtpUFg" points="[5, -1, -97, 0]$[85, -3, -17, -2]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0SiXFlEeK8x7zQKtpUFg" id="(0.24285714285714285,0.45)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_PI0SinFlEeK8x7zQKtpUFg" type="4004" source="_PIzrbXFlEeK8x7zQKtpUFg" target="_PIzrcXFlEeK8x7zQKtpUFg">
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Si3FlEeK8x7zQKtpUFg" visible="false" type="6003">
+ <edges xmi:type="notation:Connector" xmi:id="_PI0SinFlEeK8x7zQKtpUFg" type="ControlFlow_Edge" source="_PIzrbXFlEeK8x7zQKtpUFg" target="_PIzrcXFlEeK8x7zQKtpUFg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Si3FlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SjHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SjXFlEeK8x7zQKtpUFg" visible="false" type="6004">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SjXFlEeK8x7zQKtpUFg" visible="false" type="ControlFlow_WeightLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SjnFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sj3FlEeK8x7zQKtpUFg" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0Sj3FlEeK8x7zQKtpUFg" type="ControlFlow_GuardLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SkHFlEeK8x7zQKtpUFg" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_PI0SkXFlEeK8x7zQKtpUFg" type="6011">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PI0SkXFlEeK8x7zQKtpUFg" type="ControlFlow_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_PI0SknFlEeK8x7zQKtpUFg" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PI0Sk3FlEeK8x7zQKtpUFg"/>
@@ -851,13 +943,16 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PI0SlXFlEeK8x7zQKtpUFg" id="(0.4,0.225)"/>
</edges>
</notation:Diagram>
- <nattable:Table xmi:id="_0TYNgJoYEeOBraiw2Bz-fA" description="Table Description" name="DefaultTable(Converted)" currentRowAxisProvider="_0TYNgpoYEeOBraiw2Bz-fA" currentColumnAxisProvider="_0TYNgZoYEeOBraiw2Bz-fA">
+ <nattable:Table xmi:id="_0TYNgJoYEeOBraiw2Bz-fA" description="Table Description" name="DefaultTable(Converted)" currentRowAxisProvider="_0TYNgpoYEeOBraiw2Bz-fA" currentColumnAxisProvider="_0TYNgZoYEeOBraiw2Bz-fA" tableKindId="org.eclipse.papyrus.uml.table.generic">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z1G8kCmyEeub5o5WSuQ6zg" source="http://www.eclipse.org/papyrus/infra/nattable/version">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z1G8kSmyEeub5o5WSuQ6zg" key="version" value="1.3.0"/>
+ </eAnnotations>
<context xmi:type="uml:Model" href="model.uml#_PI4jwHFlEeK8x7zQKtpUFg"/>
- <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#PapyrusGenericTable_XMI_ID"/>
<columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0TYNgZoYEeOBraiw2Bz-fA" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"/>
<rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0TYNgpoYEeOBraiw2Bz-fA" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
<axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_0TYNg5oYEeOBraiw2Bz-fA">
- <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#_P0EFEDzQEei_1txcmoHe_A"/>
<element xmi:type="uml:Class" href="model.uml#_PI4jwnFlEeK8x7zQKtpUFg"/>
</axis>
</rowAxisProvidersHistory>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
index c601b47..f016b79 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_PI4jwHFlEeK8x7zQKtpUFg" name="model">
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_PI4jwHFlEeK8x7zQKtpUFg" name="model">
<packageImport xmi:type="uml:PackageImport" xmi:id="_PI4jwXFlEeK8x7zQKtpUFg">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
@@ -8,50 +8,50 @@
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PI4jxHFlEeK8x7zQKtpUFg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PI4jxXFlEeK8x7zQKtpUFg" value="1"/>
</ownedAttribute>
- <ownedBehavior xmi:type="uml:Activity" xmi:id="_PI4jxnFlEeK8x7zQKtpUFg" name="Activity1" group="_PI4jx3FlEeK8x7zQKtpUFg _PI4jy3FlEeK8x7zQKtpUFg" node="_PI4j5HFlEeK8x7zQKtpUFg _PI4j5XFlEeK8x7zQKtpUFg _PI4j5nFlEeK8x7zQKtpUFg _PI4j53FlEeK8x7zQKtpUFg _PI4j6HFlEeK8x7zQKtpUFg">
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4jzHFlEeK8x7zQKtpUFg" name="ControlFlow1" source="_PI4j5HFlEeK8x7zQKtpUFg" target="_PI4jyHFlEeK8x7zQKtpUFg">
+ <ownedBehavior xmi:type="uml:Activity" xmi:id="_PI4jxnFlEeK8x7zQKtpUFg" name="Activity1" node="_PI4j5HFlEeK8x7zQKtpUFg _PI4j5XFlEeK8x7zQKtpUFg _PI4j5nFlEeK8x7zQKtpUFg _PI4j53FlEeK8x7zQKtpUFg _PI4j6HFlEeK8x7zQKtpUFg" group="_PI4jx3FlEeK8x7zQKtpUFg _PI4jy3FlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4jzHFlEeK8x7zQKtpUFg" name="ControlFlow1" target="_PI4jyHFlEeK8x7zQKtpUFg" source="_PI4j5HFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4jzXFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4jznFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4jz3FlEeK8x7zQKtpUFg" name="ControlFlow2" source="_PI4jyHFlEeK8x7zQKtpUFg" target="_PI4jyXFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4jz3FlEeK8x7zQKtpUFg" name="ControlFlow2" target="_PI4jyXFlEeK8x7zQKtpUFg" source="_PI4jyHFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j0HFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j0XFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j0nFlEeK8x7zQKtpUFg" name="ControlFlow3" source="_PI4jyXFlEeK8x7zQKtpUFg" target="_PI4jynFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j0nFlEeK8x7zQKtpUFg" name="ControlFlow3" target="_PI4jynFlEeK8x7zQKtpUFg" source="_PI4jyXFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j03FlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j1HFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j1XFlEeK8x7zQKtpUFg" name="ControlFlow4" source="_PI4jynFlEeK8x7zQKtpUFg" target="_PI4j5nFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j1XFlEeK8x7zQKtpUFg" name="ControlFlow4" target="_PI4j5nFlEeK8x7zQKtpUFg" source="_PI4jynFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j1nFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j13FlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j2HFlEeK8x7zQKtpUFg" name="ControlFlow5" source="_PI4jynFlEeK8x7zQKtpUFg" target="_PI4j53FlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j2HFlEeK8x7zQKtpUFg" name="ControlFlow5" target="_PI4j53FlEeK8x7zQKtpUFg" source="_PI4jynFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j2XFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j2nFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j23FlEeK8x7zQKtpUFg" name="ControlFlow6" source="_PI4j53FlEeK8x7zQKtpUFg" target="_PI4j6HFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j23FlEeK8x7zQKtpUFg" name="ControlFlow6" target="_PI4j6HFlEeK8x7zQKtpUFg" source="_PI4j53FlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j3HFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j3XFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j3nFlEeK8x7zQKtpUFg" name="ControlFlow7" source="_PI4j5nFlEeK8x7zQKtpUFg" target="_PI4j6HFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j3nFlEeK8x7zQKtpUFg" name="ControlFlow7" target="_PI4j6HFlEeK8x7zQKtpUFg" source="_PI4j5nFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j33FlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j4HFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j4XFlEeK8x7zQKtpUFg" name="ControlFlow8" source="_PI4j6HFlEeK8x7zQKtpUFg" target="_PI4j5XFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j4XFlEeK8x7zQKtpUFg" name="ControlFlow8" target="_PI4j5XFlEeK8x7zQKtpUFg" source="_PI4j6HFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j4nFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4j43FlEeK8x7zQKtpUFg"/>
</edge>
<group xmi:type="uml:StructuredActivityNode" xmi:id="_PI4jx3FlEeK8x7zQKtpUFg" name="StructuredActivityNode1">
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4jyHFlEeK8x7zQKtpUFg" name="OpaqueAction1" outgoing="_PI4jz3FlEeK8x7zQKtpUFg" incoming="_PI4jzHFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4jyXFlEeK8x7zQKtpUFg" name="OpaqueAction2" outgoing="_PI4j0nFlEeK8x7zQKtpUFg" incoming="_PI4jz3FlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:DecisionNode" xmi:id="_PI4jynFlEeK8x7zQKtpUFg" name="DecisionNode1" outgoing="_PI4j1XFlEeK8x7zQKtpUFg _PI4j2HFlEeK8x7zQKtpUFg" incoming="_PI4j0nFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4jyHFlEeK8x7zQKtpUFg" name="OpaqueAction1" incoming="_PI4jzHFlEeK8x7zQKtpUFg" outgoing="_PI4jz3FlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4jyXFlEeK8x7zQKtpUFg" name="OpaqueAction2" incoming="_PI4jz3FlEeK8x7zQKtpUFg" outgoing="_PI4j0nFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:DecisionNode" xmi:id="_PI4jynFlEeK8x7zQKtpUFg" name="DecisionNode1" incoming="_PI4j0nFlEeK8x7zQKtpUFg" outgoing="_PI4j1XFlEeK8x7zQKtpUFg _PI4j2HFlEeK8x7zQKtpUFg"/>
</group>
<group xmi:type="uml:ActivityPartition" xmi:id="_PI4jy3FlEeK8x7zQKtpUFg" name="ActivityPartition1" node="_PI4j5nFlEeK8x7zQKtpUFg"/>
<node xmi:type="uml:InitialNode" xmi:id="_PI4j5HFlEeK8x7zQKtpUFg" name="InitialNode1" outgoing="_PI4jzHFlEeK8x7zQKtpUFg"/>
<node xmi:type="uml:ActivityFinalNode" xmi:id="_PI4j5XFlEeK8x7zQKtpUFg" name="ActivityFinalNode1" incoming="_PI4j4XFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4j5nFlEeK8x7zQKtpUFg" name="OpaqueAction1" inPartition="_PI4jy3FlEeK8x7zQKtpUFg" outgoing="_PI4j3nFlEeK8x7zQKtpUFg" incoming="_PI4j1XFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4j53FlEeK8x7zQKtpUFg" name="OpaqueAction2" outgoing="_PI4j23FlEeK8x7zQKtpUFg" incoming="_PI4j2HFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:MergeNode" xmi:id="_PI4j6HFlEeK8x7zQKtpUFg" name="MergeNode1" outgoing="_PI4j4XFlEeK8x7zQKtpUFg" incoming="_PI4j23FlEeK8x7zQKtpUFg _PI4j3nFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4j5nFlEeK8x7zQKtpUFg" name="OpaqueAction1" incoming="_PI4j1XFlEeK8x7zQKtpUFg" outgoing="_PI4j3nFlEeK8x7zQKtpUFg" inPartition="_PI4jy3FlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4j53FlEeK8x7zQKtpUFg" name="OpaqueAction2" incoming="_PI4j2HFlEeK8x7zQKtpUFg" outgoing="_PI4j23FlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:MergeNode" xmi:id="_PI4j6HFlEeK8x7zQKtpUFg" name="MergeNode1" incoming="_PI4j23FlEeK8x7zQKtpUFg _PI4j3nFlEeK8x7zQKtpUFg" outgoing="_PI4j4XFlEeK8x7zQKtpUFg"/>
</ownedBehavior>
<ownedBehavior xmi:type="uml:StateMachine" xmi:id="_PI4j6XFlEeK8x7zQKtpUFg" name="StateMachine1">
<region xmi:type="uml:Region" xmi:id="_PI4j6nFlEeK8x7zQKtpUFg" name="Region1">
@@ -75,48 +75,48 @@
<subvertex xmi:type="uml:Pseudostate" xmi:id="_PI4j-3FlEeK8x7zQKtpUFg" name="Fork0" kind="fork"/>
</region>
</ownedBehavior>
- <ownedBehavior xmi:type="uml:Activity" xmi:id="_PI4j_HFlEeK8x7zQKtpUFg" name="Activity2" group="_PI4j_XFlEeK8x7zQKtpUFg" node="_PI4kFnFlEeK8x7zQKtpUFg _PI4kF3FlEeK8x7zQKtpUFg _PI4kGHFlEeK8x7zQKtpUFg _PI4kGXFlEeK8x7zQKtpUFg _PI4kGnFlEeK8x7zQKtpUFg _PI4kG3FlEeK8x7zQKtpUFg _PI4kHHFlEeK8x7zQKtpUFg _PI4kHXFlEeK8x7zQKtpUFg">
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j_nFlEeK8x7zQKtpUFg" name="ControlFlow1" source="_PI4kFnFlEeK8x7zQKtpUFg" target="_PI4kF3FlEeK8x7zQKtpUFg">
+ <ownedBehavior xmi:type="uml:Activity" xmi:id="_PI4j_HFlEeK8x7zQKtpUFg" name="Activity2" node="_PI4kFnFlEeK8x7zQKtpUFg _PI4kF3FlEeK8x7zQKtpUFg _PI4kGHFlEeK8x7zQKtpUFg _PI4kGXFlEeK8x7zQKtpUFg _PI4kGnFlEeK8x7zQKtpUFg _PI4kG3FlEeK8x7zQKtpUFg _PI4kHHFlEeK8x7zQKtpUFg _PI4kHXFlEeK8x7zQKtpUFg" group="_PI4j_XFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4j_nFlEeK8x7zQKtpUFg" name="ControlFlow1" target="_PI4kF3FlEeK8x7zQKtpUFg" source="_PI4kFnFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4j_3FlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kAHFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kAXFlEeK8x7zQKtpUFg" name="ControlFlow2" source="_PI4kF3FlEeK8x7zQKtpUFg" target="_PI4kHHFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kAXFlEeK8x7zQKtpUFg" name="ControlFlow2" target="_PI4kHHFlEeK8x7zQKtpUFg" source="_PI4kF3FlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kAnFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kA3FlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kBHFlEeK8x7zQKtpUFg" name="ControlFlow3" source="_PI4kHHFlEeK8x7zQKtpUFg" target="_PI4kGHFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kBHFlEeK8x7zQKtpUFg" name="ControlFlow3" target="_PI4kGHFlEeK8x7zQKtpUFg" source="_PI4kHHFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kBXFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kBnFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kB3FlEeK8x7zQKtpUFg" name="ControlFlow4" source="_PI4kHHFlEeK8x7zQKtpUFg" target="_PI4kGXFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kB3FlEeK8x7zQKtpUFg" name="ControlFlow4" target="_PI4kGXFlEeK8x7zQKtpUFg" source="_PI4kHHFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kCHFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kCXFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kCnFlEeK8x7zQKtpUFg" name="ControlFlow5" source="_PI4kGHFlEeK8x7zQKtpUFg" target="_PI4kHXFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kCnFlEeK8x7zQKtpUFg" name="ControlFlow5" target="_PI4kHXFlEeK8x7zQKtpUFg" source="_PI4kGHFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kC3FlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kDHFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kDXFlEeK8x7zQKtpUFg" name="ControlFlow6" source="_PI4kGXFlEeK8x7zQKtpUFg" target="_PI4kHXFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kDXFlEeK8x7zQKtpUFg" name="ControlFlow6" target="_PI4kHXFlEeK8x7zQKtpUFg" source="_PI4kGXFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kDnFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kD3FlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kEHFlEeK8x7zQKtpUFg" name="ControlFlow7" source="_PI4kHXFlEeK8x7zQKtpUFg" target="_PI4kGnFlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kEHFlEeK8x7zQKtpUFg" name="ControlFlow7" target="_PI4kGnFlEeK8x7zQKtpUFg" source="_PI4kHXFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kEXFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kEnFlEeK8x7zQKtpUFg"/>
</edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kE3FlEeK8x7zQKtpUFg" name="ControlFlow8" source="_PI4kGnFlEeK8x7zQKtpUFg" target="_PI4kG3FlEeK8x7zQKtpUFg">
+ <edge xmi:type="uml:ControlFlow" xmi:id="_PI4kE3FlEeK8x7zQKtpUFg" name="ControlFlow8" target="_PI4kG3FlEeK8x7zQKtpUFg" source="_PI4kGnFlEeK8x7zQKtpUFg">
<guard xmi:type="uml:LiteralBoolean" xmi:id="_PI4kFHFlEeK8x7zQKtpUFg" value="true"/>
<weight xmi:type="uml:LiteralInteger" xmi:id="_PI4kFXFlEeK8x7zQKtpUFg"/>
</edge>
<group xmi:type="uml:ActivityPartition" xmi:id="_PI4j_XFlEeK8x7zQKtpUFg" name="ActivityPartition1" node="_PI4kGHFlEeK8x7zQKtpUFg _PI4kGXFlEeK8x7zQKtpUFg"/>
<node xmi:type="uml:InitialNode" xmi:id="_PI4kFnFlEeK8x7zQKtpUFg" name="InitialNode1" outgoing="_PI4j_nFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kF3FlEeK8x7zQKtpUFg" name="OpaqueAction1" outgoing="_PI4kAXFlEeK8x7zQKtpUFg" incoming="_PI4j_nFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGHFlEeK8x7zQKtpUFg" name="OpaqueAction2" inPartition="_PI4j_XFlEeK8x7zQKtpUFg" outgoing="_PI4kCnFlEeK8x7zQKtpUFg" incoming="_PI4kBHFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGXFlEeK8x7zQKtpUFg" name="OpaqueAction3" inPartition="_PI4j_XFlEeK8x7zQKtpUFg" outgoing="_PI4kDXFlEeK8x7zQKtpUFg" incoming="_PI4kB3FlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGnFlEeK8x7zQKtpUFg" name="OpaqueAction4" outgoing="_PI4kE3FlEeK8x7zQKtpUFg" incoming="_PI4kEHFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kF3FlEeK8x7zQKtpUFg" name="OpaqueAction1" incoming="_PI4j_nFlEeK8x7zQKtpUFg" outgoing="_PI4kAXFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGHFlEeK8x7zQKtpUFg" name="OpaqueAction2" incoming="_PI4kBHFlEeK8x7zQKtpUFg" outgoing="_PI4kCnFlEeK8x7zQKtpUFg" inPartition="_PI4j_XFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGXFlEeK8x7zQKtpUFg" name="OpaqueAction3" incoming="_PI4kB3FlEeK8x7zQKtpUFg" outgoing="_PI4kDXFlEeK8x7zQKtpUFg" inPartition="_PI4j_XFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:OpaqueAction" xmi:id="_PI4kGnFlEeK8x7zQKtpUFg" name="OpaqueAction4" incoming="_PI4kEHFlEeK8x7zQKtpUFg" outgoing="_PI4kE3FlEeK8x7zQKtpUFg"/>
<node xmi:type="uml:ActivityFinalNode" xmi:id="_PI4kG3FlEeK8x7zQKtpUFg" name="ActivityFinalNode1" incoming="_PI4kE3FlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:ForkNode" xmi:id="_PI4kHHFlEeK8x7zQKtpUFg" name="ForkNode1" outgoing="_PI4kBHFlEeK8x7zQKtpUFg _PI4kB3FlEeK8x7zQKtpUFg" incoming="_PI4kAXFlEeK8x7zQKtpUFg"/>
- <node xmi:type="uml:JoinNode" xmi:id="_PI4kHXFlEeK8x7zQKtpUFg" name="JoinNode1" outgoing="_PI4kEHFlEeK8x7zQKtpUFg" incoming="_PI4kCnFlEeK8x7zQKtpUFg _PI4kDXFlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:ForkNode" xmi:id="_PI4kHHFlEeK8x7zQKtpUFg" name="ForkNode1" incoming="_PI4kAXFlEeK8x7zQKtpUFg" outgoing="_PI4kBHFlEeK8x7zQKtpUFg _PI4kB3FlEeK8x7zQKtpUFg"/>
+ <node xmi:type="uml:JoinNode" xmi:id="_PI4kHXFlEeK8x7zQKtpUFg" name="JoinNode1" incoming="_PI4kCnFlEeK8x7zQKtpUFg _PI4kDXFlEeK8x7zQKtpUFg" outgoing="_PI4kEHFlEeK8x7zQKtpUFg"/>
</ownedBehavior>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_PI4kHnFlEeK8x7zQKtpUFg" name="Bar">
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
index 61fa2de..8dee3c6 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
+++ b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
@@ -41,12 +41,20 @@
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
import org.eclipse.papyrus.cdo.internal.ui.editors.PapyrusCDOEditorManager;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
@@ -212,6 +220,10 @@
assertThat(result, instanceOf(IMultiDiagramEditor.class));
lastEditor = (IMultiDiagramEditor) result;
+
+ openDiagram(lastEditor, "classes");
+
+
if (lastEditor.getActiveEditor() instanceof DiagramDocumentEditor) {
lastDiagramEditor = (DiagramDocumentEditor) lastEditor.getActiveEditor();
}
@@ -225,6 +237,42 @@
return null; // make the compiler happy
}
}
+
+ public void openDiagram(IMultiDiagramEditor editor, final String name) {
+
+ try {
+ ModelSet modelSet = ServiceUtils.getInstance().getModelSet(editor.getServicesRegistry());
+ NotationModel notation = (NotationModel) modelSet.getModel(NotationModel.MODEL_ID);
+ Diagram diagram = notation.getDiagram(name);
+ ServiceUtils.getInstance().getService(IPageManager.class, editor.getServicesRegistry()).openPage(diagram);
+ flushDisplayEvents();
+ activateDiagram(editor, name);
+ } catch (Exception e) {
+ throw new IllegalStateException("Cannot initialize test", e);
+ }
+ }
+
+ public void activateDiagram(IMultiDiagramEditor editor, final String name) {
+ ISashWindowsContainer sashContainer = lastEditor.getAdapter(ISashWindowsContainer.class);
+
+ final org.eclipse.papyrus.infra.core.sasheditor.editor.IPage[] select = { null };
+ sashContainer.visit(new IPageVisitor() {
+ @Override
+ public void accept(IEditorPage page) {
+ if (name.equals(page.getPageTitle()) && (page.getIEditorPart() instanceof DiagramEditorWithFlyOutPalette)) {
+ select[0] = page;
+ }
+ }
+ @Override
+ public void accept(IComponentPage page) {
+ // Pass
+ }
+ });
+ if (select[0] != null) {
+ sashContainer.selectPage(select[0]);
+ flushDisplayEvents();
+ }
+ }
protected void closeEditor() {
closeEditor(lastEditor);
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
index e094f1e..8c549ee 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
@@ -1,17 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="admin.notation#_a6YuMBexEeOaDesjAlqXXw"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="admin.notation#_a6YuMBexEeOaDesjAlqXXw"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
index d0101d0..600bc54 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_a6YuMBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_a6YuMRexEeOaDesjAlqXXw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_a6YuMhexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuMxexEeOaDesjAlqXXw" type="7017">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a6YuMBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_a6YuMRexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a6YuMhexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuMxexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a6YuNBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a6YuNRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -11,7 +11,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a6YuOBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuORexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuOhexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuOhexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a6YuOxexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a6YuPBexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -20,7 +20,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a6YuPxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuQBexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuQRexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuQRexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a6YuQhexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a6YuQxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -29,9 +29,16 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a6YuRhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuRxexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_i7cpESm4Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_i7cpEim4Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="admin.uml#_a62oQxexEeOaDesjAlqXXw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuSBexEeOaDesjAlqXXw" x="80" y="89"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuSBexEeOaDesjAlqXXw" x="100" y="80"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_a6YuSRexEeOaDesjAlqXXw"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_i7cpECm4Eeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="admin.uml#_a62oQBexEeOaDesjAlqXXw"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_i7cpEym4Eeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Model" href="admin.uml#_a62oQBexEeOaDesjAlqXXw"/>
</notation:Diagram>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
index dba6a6b..8c549ee 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
@@ -1,23 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="garage.notation#_a4w9kBexEeOaDesjAlqXXw"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="garage.notation#_a45gcBexEeOaDesjAlqXXw"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="garage.notation#_a4w9kBexEeOaDesjAlqXXw"/>
- </children>
- <children>
- <emfPageIdentifier href="garage.notation#_a45gcBexEeOaDesjAlqXXw"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
index f4382bd..57140c3 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_a4w9kBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_a4w9kRexEeOaDesjAlqXXw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w9khexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9kxexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a4w9kRexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w9khexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9kxexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9lBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9lRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -12,7 +12,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w9mBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9mRexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9mhexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9mhexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9mxexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9nBexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -21,7 +21,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w9nxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9oBexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9oRexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9oRexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9ohexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9oxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -37,12 +37,15 @@
<styles xmi:type="notation:TitleStyle" xmi:id="_a4w9qxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9rBexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lFp20Sm4Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lFp20im4Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="garage.uml#_a5Qs0RexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9rRexEeOaDesjAlqXXw" x="63" y="50"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a4w9rhexEeOaDesjAlqXXw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w9rxexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9sBexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a4w9rhexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w9rxexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9sBexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9sRexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9shexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -51,7 +54,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w9tRexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9thexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9txexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9txexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9uBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9uRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -60,7 +63,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w9vBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9vRexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9vhexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9vhexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9vxexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9wBexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -76,12 +79,15 @@
<styles xmi:type="notation:TitleStyle" xmi:id="_a4w9yBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9yRexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lFp20ym4Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lFp21Cm4Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="garage.uml#_a5Qs6RexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9yhexEeOaDesjAlqXXw" x="451" y="103"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a4w9yxexEeOaDesjAlqXXw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w9zBexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9zRexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a4w9yxexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w9zBexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9zRexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9zhexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9zxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -90,7 +96,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w90hexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w90xexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w91BexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w91BexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w91RexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w91hexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -99,7 +105,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w92RexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w92hexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w92xexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w92xexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w93BexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w93RexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -115,12 +121,15 @@
<styles xmi:type="notation:TitleStyle" xmi:id="_a4w95RexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w95hexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lFp21Sm4Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lFp21im4Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="garage.uml#_a5Qs6hexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w95xexEeOaDesjAlqXXw" x="36" y="252"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a4w96BexEeOaDesjAlqXXw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w96RexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w96hexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a4w96BexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w96RexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w96hexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w96xexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w97BexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -129,7 +138,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w97xexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w98BexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w98RexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w98RexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w98hexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w98xexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -138,7 +147,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a4w99hexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w99xexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9-BexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a4w9-BexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a4w9-RexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a4w9-hexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -154,28 +163,35 @@
<styles xmi:type="notation:TitleStyle" xmi:id="_a4w-AhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w-AxexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_lFp21ym4Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lFp22Cm4Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="garage.uml#_a5Qs8xexEeOaDesjAlqXXw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w-BBexEeOaDesjAlqXXw" x="279" y="252"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w-BBexEeOaDesjAlqXXw" x="280" y="260"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_a4w-BRexEeOaDesjAlqXXw"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_lFp20Cm4Eeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="garage.uml#_a5Qs0BexEeOaDesjAlqXXw"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_lFqd4Cm4Eeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Model" href="garage.uml#_a5Qs0BexEeOaDesjAlqXXw"/>
- <edges xmi:type="notation:Connector" xmi:id="_a4w-BhexEeOaDesjAlqXXw" type="4001" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w9yxexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-BxexEeOaDesjAlqXXw" type="6001">
+ <edges xmi:type="notation:Connector" xmi:id="_a4w-BhexEeOaDesjAlqXXw" type="Association_Edge" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w9yxexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-BxexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-CBexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-CRexEeOaDesjAlqXXw" visible="false" type="6002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-CRexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-ChexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-CxexEeOaDesjAlqXXw" visible="false" type="6003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-CxexEeOaDesjAlqXXw" visible="false" type="Association_TargetRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-DBexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-DRexEeOaDesjAlqXXw" type="6005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-DRexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-DhexEeOaDesjAlqXXw" x="-12" y="42"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-DxexEeOaDesjAlqXXw" type="6033">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-DxexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-EBexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-ERexEeOaDesjAlqXXw" type="6034">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-ERexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-EhexEeOaDesjAlqXXw" x="-4" y="-37"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a4w-ExexEeOaDesjAlqXXw"/>
@@ -183,23 +199,23 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a4w-FBexEeOaDesjAlqXXw" points="[29, 50, -71, -119]$[110, 157, 10, -12]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4w-FRexEeOaDesjAlqXXw" id="(0.53,0.07)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a4w-FhexEeOaDesjAlqXXw" type="4001" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w9rhexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-FxexEeOaDesjAlqXXw" type="6001">
+ <edges xmi:type="notation:Connector" xmi:id="_a4w-FhexEeOaDesjAlqXXw" type="Association_Edge" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w9rhexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-FxexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-GBexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-GRexEeOaDesjAlqXXw" visible="false" type="6002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-GRexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-GhexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-GxexEeOaDesjAlqXXw" visible="false" type="6003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-GxexEeOaDesjAlqXXw" visible="false" type="Association_TargetRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-HBexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-HRexEeOaDesjAlqXXw" type="6005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-HRexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-HhexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-HxexEeOaDesjAlqXXw" type="6033">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-HxexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-IBexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-IRexEeOaDesjAlqXXw" type="6034">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-IRexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-IhexEeOaDesjAlqXXw" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a4w-IxexEeOaDesjAlqXXw"/>
@@ -207,53 +223,67 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a4w-JBexEeOaDesjAlqXXw" points="[11, 2, -248, -45]$[209, 56, -50, 9]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4w-JRexEeOaDesjAlqXXw" id="(0.89,0.43)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a4w-JhexEeOaDesjAlqXXw" type="4001" source="_a4w96BexEeOaDesjAlqXXw" target="_a4w9rhexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-JxexEeOaDesjAlqXXw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-KBexEeOaDesjAlqXXw" y="-20"/>
+ <edges xmi:type="notation:Connector" xmi:id="_a4w-JhexEeOaDesjAlqXXw" type="Association_Edge" source="_a4w96BexEeOaDesjAlqXXw" target="_a4w9rhexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-JxexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvMjECm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-KBexEeOaDesjAlqXXw" x="-1" y="-18"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-KRexEeOaDesjAlqXXw" visible="false" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-KhexEeOaDesjAlqXXw" y="20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-KRexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvNxMCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-KhexEeOaDesjAlqXXw" y="19"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-KxexEeOaDesjAlqXXw" visible="false" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-LBexEeOaDesjAlqXXw" y="-20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-KxexEeOaDesjAlqXXw" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvOYQCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-LBexEeOaDesjAlqXXw" x="15" y="-18"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-LRexEeOaDesjAlqXXw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-LhexEeOaDesjAlqXXw" y="20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-LRexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvO_UCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-LhexEeOaDesjAlqXXw" x="-17" y="19"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-LxexEeOaDesjAlqXXw" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-MBexEeOaDesjAlqXXw" y="20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-LxexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvPmYCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-MBexEeOaDesjAlqXXw" x="15" y="19"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-MRexEeOaDesjAlqXXw" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-MhexEeOaDesjAlqXXw" y="-20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-MRexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvQNcCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-MhexEeOaDesjAlqXXw" x="-17" y="-18"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a4w-MxexEeOaDesjAlqXXw"/>
<element xmi:type="uml:Association" href="garage.uml#_a5Qs9xexEeOaDesjAlqXXw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a4w-NBexEeOaDesjAlqXXw" points="[6, -18, -54, 150]$[51, -118, -9, 50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4w-NRexEeOaDesjAlqXXw" id="(0.74,0.18)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4w-NRexEeOaDesjAlqXXw" id="(0.8,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvalgCm4Eeub5o5WSuQ6zg" id="(0.0,0.87)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a4w-NhexEeOaDesjAlqXXw" type="4001" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w96BexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-NxexEeOaDesjAlqXXw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-OBexEeOaDesjAlqXXw" y="-20"/>
+ <edges xmi:type="notation:Connector" xmi:id="_a4w-NhexEeOaDesjAlqXXw" type="Association_Edge" source="_a4w9kRexEeOaDesjAlqXXw" target="_a4w96BexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-NxexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvQ0gCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-OBexEeOaDesjAlqXXw" x="1" y="-18"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-ORexEeOaDesjAlqXXw" visible="false" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-OhexEeOaDesjAlqXXw" y="20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-ORexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvQ0gSm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-OhexEeOaDesjAlqXXw" x="1" y="18"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4w-OxexEeOaDesjAlqXXw" visible="false" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-PBexEeOaDesjAlqXXw" y="-20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4w-OxexEeOaDesjAlqXXw" visible="false" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvRbkCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4w-PBexEeOaDesjAlqXXw" x="25" y="-19"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4xkoBexEeOaDesjAlqXXw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkoRexEeOaDesjAlqXXw" x="-16" y="24"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4xkoBexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvSCoCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkoRexEeOaDesjAlqXXw" x="-43" y="21"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4xkohexEeOaDesjAlqXXw" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkoxexEeOaDesjAlqXXw" y="20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4xkohexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvSpsCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkoxexEeOaDesjAlqXXw" x="25" y="17"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a4xkpBexEeOaDesjAlqXXw" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkpRexEeOaDesjAlqXXw" y="-20"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_a4xkpBexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lvTQwCm4Eeub5o5WSuQ6zg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_a4xkpRexEeOaDesjAlqXXw" x="-27" y="-18"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a4xkphexEeOaDesjAlqXXw"/>
<element xmi:type="uml:Association" href="garage.uml#_a5Qs-xexEeOaDesjAlqXXw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a4xkpxexEeOaDesjAlqXXw" points="[13, 25, -112, -202]$[91, 177, -34, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4xkqBexEeOaDesjAlqXXw" id="(0.78,0.75)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a4xkqBexEeOaDesjAlqXXw" id="(1.0,0.7)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvalgSm4Eeub5o5WSuQ6zg" id="(0.06,0.0)"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_a45gcBexEeOaDesjAlqXXw" type="PapyrusUMLStateMachineDiagram" name="operation_cycle" measurementUnit="Pixel">
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
index ad757ed..247ed5e 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
@@ -1,17 +1,2 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="j2ee.profile.notation#_a8MFABexEeOaDesjAlqXXw"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="j2ee.profile.notation#_a8MFABexEeOaDesjAlqXXw"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
index 345c59f..7cfb515 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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" xmi:id="_a8MFABexEeOaDesjAlqXXw" type="PapyrusUMLProfileDiagram" name="profile" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a8MFABexEeOaDesjAlqXXw" type="PapyrusUMLProfileDiagram" name="profile" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_a8MFARexEeOaDesjAlqXXw" type="1026">
<children xmi:type="notation:DecorationNode" xmi:id="_a8MFAhexEeOaDesjAlqXXw" type="1034"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_a8MFAxexEeOaDesjAlqXXw" type="1071">
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
index d74a837..7ba8d53 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a8wFsBexEeOaDesjAlqXXw" name="j2ee" metaclassReference="_a8wFyhexEeOaDesjAlqXXw _a8wFyxexEeOaDesjAlqXXw">
- <eAnnotations xmi:id="_a8wFsRexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8wFsRexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML">
<contents xmi:type="ecore:EPackage" xmi:id="_a8wFshexEeOaDesjAlqXXw" name="j2ee" nsURI="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" nsPrefix="j2ee">
- <eAnnotations xmi:id="_a8wFsxexEeOaDesjAlqXXw" source="PapyrusVersion">
- <details xmi:id="_a8wFtBexEeOaDesjAlqXXw" key="Version" value="0.0.1"/>
- <details xmi:id="_a8wFtRexEeOaDesjAlqXXw" key="Comment" value=""/>
- <details xmi:id="_a8wFthexEeOaDesjAlqXXw" key="Copyright" value=""/>
- <details xmi:id="_a8wFtxexEeOaDesjAlqXXw" key="Date" value="2013-01-07"/>
- <details xmi:id="_a8wFuBexEeOaDesjAlqXXw" key="Author" value=""/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8wFsxexEeOaDesjAlqXXw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8wFtBexEeOaDesjAlqXXw" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8wFtRexEeOaDesjAlqXXw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8wFthexEeOaDesjAlqXXw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8wFtxexEeOaDesjAlqXXw" key="Date" value="2013-01-07"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8wFuBexEeOaDesjAlqXXw" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_a8wFuRexEeOaDesjAlqXXw" name="Bean">
- <eAnnotations xmi:id="_a8wFuhexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wFzBexEeOaDesjAlqXXw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8wFuhexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wFzBexEeOaDesjAlqXXw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_a8wFuxexEeOaDesjAlqXXw" name="base_Classifier" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
@@ -18,31 +18,31 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_a8wFvxexEeOaDesjAlqXXw" name="primaryFinder" ordered="false" eType="_a8wFxhexEeOaDesjAlqXXw"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_a8wFwRexEeOaDesjAlqXXw" name="BeanKind">
- <eAnnotations xmi:id="_a8wFwhexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wF1BexEeOaDesjAlqXXw"/>
- <eLiterals xmi:id="_a8wFwxexEeOaDesjAlqXXw" name="entity"/>
- <eLiterals xmi:id="_a8wFxBexEeOaDesjAlqXXw" name="session" value="1"/>
- <eLiterals xmi:id="_a8wFxRexEeOaDesjAlqXXw" name="messagedriven" value="2"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8wFwhexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wF1BexEeOaDesjAlqXXw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_a8wFwxexEeOaDesjAlqXXw" name="entity"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_a8wFxBexEeOaDesjAlqXXw" name="session" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_a8wFxRexEeOaDesjAlqXXw" name="messagedriven" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_a8wFxhexEeOaDesjAlqXXw" name="Finder">
- <eAnnotations xmi:id="_a8wFxxexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wF2BexEeOaDesjAlqXXw"/>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8wFxxexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_a8wF2BexEeOaDesjAlqXXw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_a8wFyBexEeOaDesjAlqXXw" name="base_Operation" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
</eAnnotations>
- <elementImport xmi:id="_a8wFyhexEeOaDesjAlqXXw" alias="Classifier">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_a8wFyhexEeOaDesjAlqXXw" alias="Classifier">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
</elementImport>
- <elementImport xmi:id="_a8wFyxexEeOaDesjAlqXXw" alias="Operation">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_a8wFyxexEeOaDesjAlqXXw" alias="Operation">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</elementImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_a8wFzBexEeOaDesjAlqXXw" name="Bean">
- <ownedAttribute xmi:id="_a8wFzRexEeOaDesjAlqXXw" name="base_Classifier" association="_a8wF0hexEeOaDesjAlqXXw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a8wFzRexEeOaDesjAlqXXw" name="base_Classifier" association="_a8wF0hexEeOaDesjAlqXXw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_a8wFzhexEeOaDesjAlqXXw" name="kind" type="_a8wF1BexEeOaDesjAlqXXw"/>
- <ownedAttribute xmi:id="_a8wFzxexEeOaDesjAlqXXw" name="primaryFinder" type="_a8wF2BexEeOaDesjAlqXXw" association="_a8wF3BexEeOaDesjAlqXXw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a8wFzhexEeOaDesjAlqXXw" name="kind" type="_a8wF1BexEeOaDesjAlqXXw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a8wFzxexEeOaDesjAlqXXw" name="primaryFinder" type="_a8wF2BexEeOaDesjAlqXXw" association="_a8wF3BexEeOaDesjAlqXXw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a8wF0BexEeOaDesjAlqXXw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a8wF0RexEeOaDesjAlqXXw" value="1"/>
</ownedAttribute>
@@ -51,12 +51,12 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_a8wF0xexEeOaDesjAlqXXw" name="extension_Bean" type="_a8wFzBexEeOaDesjAlqXXw" aggregation="composite" association="_a8wF0hexEeOaDesjAlqXXw"/>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_a8wF1BexEeOaDesjAlqXXw" name="BeanKind">
- <ownedLiteral xmi:id="_a8wF1RexEeOaDesjAlqXXw" name="entity"/>
- <ownedLiteral xmi:id="_a8wF1hexEeOaDesjAlqXXw" name="session"/>
- <ownedLiteral xmi:id="_a8wF1xexEeOaDesjAlqXXw" name="messagedriven"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_a8wF1RexEeOaDesjAlqXXw" name="entity"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_a8wF1hexEeOaDesjAlqXXw" name="session"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_a8wF1xexEeOaDesjAlqXXw" name="messagedriven"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_a8wF2BexEeOaDesjAlqXXw" name="Finder">
- <ownedAttribute xmi:id="_a8wF2RexEeOaDesjAlqXXw" name="base_Operation" association="_a8wF2hexEeOaDesjAlqXXw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a8wF2RexEeOaDesjAlqXXw" name="base_Operation" association="_a8wF2hexEeOaDesjAlqXXw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</ownedAttribute>
</packagedElement>
@@ -64,7 +64,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_a8wF2xexEeOaDesjAlqXXw" name="extension_Finder" type="_a8wF2BexEeOaDesjAlqXXw" aggregation="composite" association="_a8wF2hexEeOaDesjAlqXXw"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_a8wF3BexEeOaDesjAlqXXw" name="bean_finder_1" memberEnd="_a8wF3RexEeOaDesjAlqXXw _a8wFzxexEeOaDesjAlqXXw">
- <ownedEnd xmi:id="_a8wF3RexEeOaDesjAlqXXw" name="bean" type="_a8wFzBexEeOaDesjAlqXXw" association="_a8wF3BexEeOaDesjAlqXXw">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_a8wF3RexEeOaDesjAlqXXw" name="bean" type="_a8wFzBexEeOaDesjAlqXXw" association="_a8wF3BexEeOaDesjAlqXXw">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a8wF3hexEeOaDesjAlqXXw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a8wF3xexEeOaDesjAlqXXw" value="1"/>
</ownedEnd>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
index 517cfbb..8c549ee 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
@@ -1,23 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList>
- <availablePage>
- <emfPageIdentifier href="tracker.notation#_a2RqQBexEeOaDesjAlqXXw"/>
- </availablePage>
- <availablePage>
- <emfPageIdentifier href="tracker.notation#_a2jXEBexEeOaDesjAlqXXw"/>
- </availablePage>
- </pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="tracker.notation#_a2RqQBexEeOaDesjAlqXXw"/>
- </children>
- <children>
- <emfPageIdentifier href="tracker.notation#_a2jXEBexEeOaDesjAlqXXw"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
index f88243f..da7fdbd 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
@@ -1,20 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" 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">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_a2RqQBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_a2RqQRexEeOaDesjAlqXXw" type="2008">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqQhexEeOaDesjAlqXXw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgKY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgaY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgqY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFg6Y9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSskKY9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2RqSBexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqSRexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a2RqQRexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2RqSBexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqSRexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqShexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqSxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_a2RqTBexEeOaDesjAlqXXw" type="3012">
+ <children xmi:type="notation:Shape" xmi:id="_a2RqTBexEeOaDesjAlqXXw" type="Property_ClassAttributeLabel">
<element xmi:type="uml:Property" href="tracker.uml#_a28_sxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2RqTRexEeOaDesjAlqXXw"/>
</children>
@@ -23,18 +16,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2RqUBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqURexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqUhexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqUhexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqUxexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqVBexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_a2RqVRexEeOaDesjAlqXXw" type="3013">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqVhexEeOaDesjAlqXXw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSWW8KY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AKY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AaY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AqY9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-A6Y9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/>
- </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_a2RqVRexEeOaDesjAlqXXw" type="Operation_ClassOperationLabel">
<element xmi:type="uml:Operation" href="tracker.uml#_a29ACRexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2RqXBexEeOaDesjAlqXXw"/>
</children>
@@ -43,7 +29,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2RqXxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqYBexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqYRexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqYRexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqYhexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqYxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -52,27 +38,23 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2RqZhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqZxexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_WUNmUCm5Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WUNmUSm5Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="tracker.uml#_a28_shexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqaBexEeOaDesjAlqXXw" x="99" y="173"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a2RqaRexEeOaDesjAlqXXw" type="2008">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqahexEeOaDesjAlqXXw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSruIKY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSruIaY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMKY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMaY9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMqY9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2RqcBexEeOaDesjAlqXXw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqcRexEeOaDesjAlqXXw" type="7017">
+ <children xmi:type="notation:Shape" xmi:id="_a2RqaRexEeOaDesjAlqXXw" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2RqcBexEeOaDesjAlqXXw" type="Class_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqcRexEeOaDesjAlqXXw" type="Class_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqchexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqcxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
- <children xmi:type="notation:Shape" xmi:id="_a2SRUBexEeOaDesjAlqXXw" type="3012">
+ <children xmi:type="notation:Shape" xmi:id="_a2SRUBexEeOaDesjAlqXXw" type="Property_ClassAttributeLabel">
<element xmi:type="uml:Property" href="tracker.uml#_a29ACxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRURexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a2SRUhexEeOaDesjAlqXXw" type="3012">
+ <children xmi:type="notation:Shape" xmi:id="_a2SRUhexEeOaDesjAlqXXw" type="Property_ClassAttributeLabel">
<element xmi:type="uml:Property" href="tracker.uml#_a29ADBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRUxexEeOaDesjAlqXXw"/>
</children>
@@ -81,7 +63,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRVhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRVxexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRWBexEeOaDesjAlqXXw" type="7018">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRWBexEeOaDesjAlqXXw" type="Class_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRWRexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRWhexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -90,7 +72,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRXRexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRXhexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRXxexEeOaDesjAlqXXw" type="7019">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRXxexEeOaDesjAlqXXw" type="Class_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRYBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRYRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -99,12 +81,15 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRZBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRZRexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_WUNmUim5Eeub5o5WSuQ6zg" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WUNmUym5Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Class" href="tracker.uml#_a29AChexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRZhexEeOaDesjAlqXXw" x="333" y="162"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a2SRZxexEeOaDesjAlqXXw" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRaBexEeOaDesjAlqXXw" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRaRexEeOaDesjAlqXXw" type="7006">
+ <children xmi:type="notation:Shape" xmi:id="_a2SRZxexEeOaDesjAlqXXw" type="Interface_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRaBexEeOaDesjAlqXXw" type="Interface_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRaRexEeOaDesjAlqXXw" type="Interface_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRahexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRaxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -113,7 +98,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRbhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRbxexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRcBexEeOaDesjAlqXXw" type="7007">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRcBexEeOaDesjAlqXXw" type="Interface_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRcRexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRchexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -122,7 +107,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRdRexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRdhexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRdxexEeOaDesjAlqXXw" type="7008">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRdxexEeOaDesjAlqXXw" type="Interface_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SReBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SReRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -131,12 +116,15 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRfBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRfRexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_WUNmVCm5Eeub5o5WSuQ6zg" type="Interface_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WUNmVSm5Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Interface" href="tracker.uml#_a29AFhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRfhexEeOaDesjAlqXXw" x="342" width="109"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_a2SRfxexEeOaDesjAlqXXw" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRgBexEeOaDesjAlqXXw" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRgRexEeOaDesjAlqXXw" type="7006">
+ <children xmi:type="notation:Shape" xmi:id="_a2SRfxexEeOaDesjAlqXXw" type="Interface_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRgBexEeOaDesjAlqXXw" type="Interface_NameLabel"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRgRexEeOaDesjAlqXXw" type="Interface_AttributeCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRghexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRgxexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -145,7 +133,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRhhexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRhxexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRiBexEeOaDesjAlqXXw" type="7007">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRiBexEeOaDesjAlqXXw" type="Interface_OperationCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRiRexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRihexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -154,7 +142,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRjRexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRjhexEeOaDesjAlqXXw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRjxexEeOaDesjAlqXXw" type="7008">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_a2SRjxexEeOaDesjAlqXXw" type="Interface_NestedClassifierCompartment">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2SRkBexEeOaDesjAlqXXw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2SRkRexEeOaDesjAlqXXw" key="showTitle" value="true"/>
</eAnnotations>
@@ -163,28 +151,51 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_a2SRlBexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRlRexEeOaDesjAlqXXw"/>
</children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_WUNmVim5Eeub5o5WSuQ6zg" type="Interface_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WUNmVym5Eeub5o5WSuQ6zg" y="5"/>
+ </children>
<element xmi:type="uml:Interface" href="tracker.uml#_a29AFxexEeOaDesjAlqXXw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2SRlhexEeOaDesjAlqXXw" x="108" y="5" width="128"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_WV0v5ym5Eeub5o5WSuQ6zg" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_WV1W8Cm5Eeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WV1W8im5Eeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="tracker.uml#_a28_shexEeOaDesjAlqXXw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WV1W8Sm5Eeub5o5WSuQ6zg" x="299" y="173"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_WV8rsym5Eeub5o5WSuQ6zg" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_WV8rtCm5Eeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WV8rtim5Eeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="tracker.uml#_a29AChexEeOaDesjAlqXXw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WV8rtSm5Eeub5o5WSuQ6zg" x="533" y="162"/>
+ </children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_a2SRlxexEeOaDesjAlqXXw"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WUM_QCm5Eeub5o5WSuQ6zg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+ <owner xmi:type="uml:Model" href="tracker.uml#_a28_sBexEeOaDesjAlqXXw"/>
+ </styles>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_WURQsCm5Eeub5o5WSuQ6zg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<element xmi:type="uml:Model" href="tracker.uml#_a28_sBexEeOaDesjAlqXXw"/>
- <edges xmi:type="notation:Connector" xmi:id="_a2SRmBexEeOaDesjAlqXXw" type="4001" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2RqaRexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRmRexEeOaDesjAlqXXw" type="6001">
+ <edges xmi:type="notation:Connector" xmi:id="_a2SRmBexEeOaDesjAlqXXw" type="Association_Edge" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2RqaRexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRmRexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRmhexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRmxexEeOaDesjAlqXXw" visible="false" type="6002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRmxexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRnBexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRnRexEeOaDesjAlqXXw" type="6003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRnRexEeOaDesjAlqXXw" type="Association_TargetRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRnhexEeOaDesjAlqXXw" x="16" y="-14"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRnxexEeOaDesjAlqXXw" type="6005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRnxexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRoBexEeOaDesjAlqXXw" x="-11" y="17"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRoRexEeOaDesjAlqXXw" type="6033">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRoRexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRohexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRoxexEeOaDesjAlqXXw" type="6034">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRoxexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRpBexEeOaDesjAlqXXw" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a2SRpRexEeOaDesjAlqXXw"/>
@@ -193,23 +204,23 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRpxexEeOaDesjAlqXXw" id="(0.8793103448275862,0.21929824561403508)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRqBexEeOaDesjAlqXXw" id="(0.18604651162790697,0.3008130081300813)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a2SRqRexEeOaDesjAlqXXw" type="4001" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2RqaRexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRqhexEeOaDesjAlqXXw" type="6001">
+ <edges xmi:type="notation:Connector" xmi:id="_a2SRqRexEeOaDesjAlqXXw" type="Association_Edge" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2RqaRexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRqhexEeOaDesjAlqXXw" type="Association_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRqxexEeOaDesjAlqXXw" y="-20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRrBexEeOaDesjAlqXXw" visible="false" type="6002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRrBexEeOaDesjAlqXXw" visible="false" type="Association_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRrRexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRrhexEeOaDesjAlqXXw" type="6003">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRrhexEeOaDesjAlqXXw" type="Association_TargetRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRrxexEeOaDesjAlqXXw" x="17" y="-12"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRsBexEeOaDesjAlqXXw" type="6005">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRsBexEeOaDesjAlqXXw" type="Association_SourceRoleLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRsRexEeOaDesjAlqXXw" x="-19" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRshexEeOaDesjAlqXXw" type="6033">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRshexEeOaDesjAlqXXw" type="Association_SourceMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRsxexEeOaDesjAlqXXw" y="20"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRtBexEeOaDesjAlqXXw" type="6034">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRtBexEeOaDesjAlqXXw" type="Association_TargetMultiplicityLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRtRexEeOaDesjAlqXXw" y="-20"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a2SRthexEeOaDesjAlqXXw"/>
@@ -218,11 +229,11 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRuBexEeOaDesjAlqXXw" id="(0.8362068965517241,0.7543859649122807)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRuRexEeOaDesjAlqXXw" id="(0.31007751937984496,0.8130081300813008)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a2SRuhexEeOaDesjAlqXXw" type="4003" source="_a2RqaRexEeOaDesjAlqXXw" target="_a2SRZxexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRuxexEeOaDesjAlqXXw" visible="false" type="6008">
+ <edges xmi:type="notation:Connector" xmi:id="_a2SRuhexEeOaDesjAlqXXw" type="InterfaceRealization_Edge" source="_a2RqaRexEeOaDesjAlqXXw" target="_a2SRZxexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRuxexEeOaDesjAlqXXw" visible="false" type="InterfaceRealization_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRvBexEeOaDesjAlqXXw" y="40"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRvRexEeOaDesjAlqXXw" visible="false" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRvRexEeOaDesjAlqXXw" visible="false" type="InterfaceRealization_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRvhexEeOaDesjAlqXXw" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a2SRvxexEeOaDesjAlqXXw"/>
@@ -230,11 +241,11 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a2SRwBexEeOaDesjAlqXXw" points="[-2, -7, 12, 112]$[-22, -69, -8, 50]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRwRexEeOaDesjAlqXXw" id="(0.5116279069767442,0.016260162601626018)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_a2SRwhexEeOaDesjAlqXXw" type="4003" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2SRfxexEeOaDesjAlqXXw">
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRwxexEeOaDesjAlqXXw" visible="false" type="6008">
+ <edges xmi:type="notation:Connector" xmi:id="_a2SRwhexEeOaDesjAlqXXw" type="InterfaceRealization_Edge" source="_a2RqQRexEeOaDesjAlqXXw" target="_a2SRfxexEeOaDesjAlqXXw">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRwxexEeOaDesjAlqXXw" visible="false" type="InterfaceRealization_StereotypeLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRxBexEeOaDesjAlqXXw" y="40"/>
</children>
- <children xmi:type="notation:DecorationNode" xmi:id="_a2SRxRexEeOaDesjAlqXXw" visible="false" type="6009">
+ <children xmi:type="notation:DecorationNode" xmi:id="_a2SRxRexEeOaDesjAlqXXw" visible="false" type="InterfaceRealization_NameLabel">
<layoutConstraint xmi:type="notation:Location" xmi:id="_a2SRxhexEeOaDesjAlqXXw" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_a2SRxxexEeOaDesjAlqXXw"/>
@@ -242,6 +253,26 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a2SRyBexEeOaDesjAlqXXw" points="[-2, -18, 5, 107]$[-10, -175, -3, -50]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2SRyRexEeOaDesjAlqXXw" id="(0.6896551724137931,0.15789473684210525)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_WV1W8ym5Eeub5o5WSuQ6zg" type="StereotypeCommentLink" source="_a2RqQRexEeOaDesjAlqXXw" target="_WV0v5ym5Eeub5o5WSuQ6zg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_WV1W9Cm5Eeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WV1W-Cm5Eeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="tracker.uml#_a28_shexEeOaDesjAlqXXw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WV1W9Sm5Eeub5o5WSuQ6zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WV1W9im5Eeub5o5WSuQ6zg"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WV1W9ym5Eeub5o5WSuQ6zg"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_WV8rtym5Eeub5o5WSuQ6zg" type="StereotypeCommentLink" source="_a2RqaRexEeOaDesjAlqXXw" target="_WV8rsym5Eeub5o5WSuQ6zg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_WV8ruCm5Eeub5o5WSuQ6zg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_WV8rvCm5Eeub5o5WSuQ6zg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="tracker.uml#_a29AChexEeOaDesjAlqXXw"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WV8ruSm5Eeub5o5WSuQ6zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WV8ruim5Eeub5o5WSuQ6zg"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WV8ruym5Eeub5o5WSuQ6zg"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_a2jXEBexEeOaDesjAlqXXw" type="PapyrusUMLActivityDiagram" name="Bug Lifecycle" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_a2jXERexEeOaDesjAlqXXw" type="2001" fontName="Lucida Grande" fontHeight="11" lineColor="0">
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
index 9d0ebe6..6e5b7e2 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:j2ee="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:j2ee="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0 j2ee.profile.uml#_a8wFshexEeOaDesjAlqXXw">
<uml:Model xmi:id="_a28_sBexEeOaDesjAlqXXw" name="BugTracker">
<packageImport xmi:type="uml:PackageImport" xmi:id="_a28_sRexEeOaDesjAlqXXw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
diff --git a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
index 7746554..080622e 100755
--- a/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
+++ b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
@@ -31,6 +31,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -40,6 +41,7 @@
import org.eclipse.papyrus.cdo.uml.internal.ui.importsources.CDOPackageImportSource;
import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
@@ -60,7 +62,7 @@
private Model model;
- private SashWindowsMngr diModel;
+ private Resource diModel;
@Test
public void testCanImportInto() {
@@ -151,7 +153,8 @@
fixture.initialize(singleton(model));
ModelSet modelSet = (ModelSet) model.eResource().getResourceSet();
- diModel = (SashWindowsMngr) EcoreUtil.getObjectByType(((AbstractBaseModel) modelSet.getModel(SashModel.MODEL_ID)).getResource().getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
+ diModel = ((AbstractBaseModel) modelSet.getModel(DiModel.DI_MODEL_ID)).getResource();
+// diModel = (SashWindowsMngr) EcoreUtil.getObjectByType(.getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
}
@After
@@ -161,9 +164,14 @@
protected DIModel getDIModel() {
// get the resource in the read-only view that corresponds to our DI model
- CDOResource resource = getMasterViewObject((CDOResource) diModel.eResource());
-
- return DIModel.getInstance(resource, true);
+// CDOResource resource = getMasterViewObject((CDOResource) diModel.eResource());
+
+ if (diModel instanceof CDOResource) {
+ CDOResource resource = getMasterViewObject((CDOResource) diModel);
+ return DIModel.getInstance(resource, true);
+ }else {
+ throw new UnsupportedOperationException();
+ }
}
static class TestFixture extends CDOPackageImportSource {
